diff --git a/layouts/partials/hx/button.html b/layouts/partials/hx/button.html
deleted file mode 100644
index f28f116..0000000
--- a/layouts/partials/hx/button.html
+++ /dev/null
@@ -1 +0,0 @@
-<button type="{{ .type }}" name="{{ .name }}">{{.label}}</button>
diff --git a/layouts/shortcodes/hx/button.html b/layouts/shortcodes/hx/button.html
index 5645864..0ce37bb 100644
--- a/layouts/shortcodes/hx/button.html
+++ b/layouts/shortcodes/hx/button.html
@@ -1,6 +1,5 @@
-{{- $type := .Get "type" | default "button" -}}
+{{- $type := .Get "type" | default "submit" -}}
 {{- $name := .Get "name" | default "submit" -}}
 {{- $label := .Get "label" | default (title $name) -}}
-
-{{- $params := dict "type" $type "name" $name "label" $label -}}
-{{ partial "hx/button" $params }}
+<button type="{{ $type }}"
+		class="btn btn-primary">{{ $label }}</button>
diff --git a/layouts/shortcodes/hx/data-field-line.html b/layouts/shortcodes/hx/data-field-line.html
index f341b2c..7b14be9 100644
--- a/layouts/shortcodes/hx/data-field-line.html
+++ b/layouts/shortcodes/hx/data-field-line.html
@@ -1,6 +1,8 @@
 {{- $type := .Get "type" | default "text" -}}
 {{- $name := .Get "name" | default "textline" -}}
+{{- $label := .Get "label" | default $name -}}
 <div>
-  <input type="{{ $type }}" name="{{ $name }}" 
+  <label class="form-label">{{- $label -}}</label>
+  <input type="{{ $type }}" name="{{ $name }}" class="form-control"
 	{{- with .Get "attrs" }} {{ . }}{{ end }}>
 </div>
diff --git a/layouts/shortcodes/hx/data-form.html b/layouts/shortcodes/hx/data-form.html
index 30198ad..4739180 100644
--- a/layouts/shortcodes/hx/data-form.html
+++ b/layouts/shortcodes/hx/data-form.html
@@ -7,5 +7,4 @@
 <form name="{{ $name }}" hx-target="{{ $target }}"
 	  hx-post="{{ $root }}/{{ $domain }}/{{ $action }}">
   {{ .Inner }}
-  <button>{{ $label }}</button>
 </form>
diff --git a/layouts/shortcodes/hx/xplore.html b/layouts/shortcodes/hx/xplore.html
index 5f7f90c..228deaf 100644
--- a/layouts/shortcodes/hx/xplore.html
+++ b/layouts/shortcodes/hx/xplore.html
@@ -1,9 +1,10 @@
-<button hx-get="/app/demo/"
+<button class="btn btn-info"
+	    hx-get="/app/demo/"
 		hx-select="[itemprop=articleBody] p">
 	Hello World!
 </button>
 
 <form hx-post="/hx/test/data" hx-target="#cs-debug">
   <input name="info">
-  <button>Post to API</button>
+  <button class="btn btn-primary">Post to API</button>
 </form>
diff --git a/sites/hx/content/auth/login.md b/sites/hx/content/auth/login.md
index 1369f5a..cfffc82 100644
--- a/sites/hx/content/auth/login.md
+++ b/sites/hx/content/auth/login.md
@@ -22,8 +22,9 @@ Please enter login data:
 
 {{< hx/data-form name="login" action="login" >}}
 
-  Login: {{< hx/data-field-line name="login" attrs="autofocus" >}}
-  Password: {{< hx/data-field-line type="password" name="password" >}}
+  {{< hx/data-field-line name="login" label="Login" attrs="autofocus" >}}
+  {{< hx/data-field-line type="password" name="password" label="Password" >}}
+  {{< hx/button label="Login" >}}
 
 {{< /hx/data-form >}}