diff --git a/pages/_includes/forms/form-elements-1.html b/pages/_includes/forms/form-elements-1.html
index 089d5ce5c..673e65f6d 100644
--- a/pages/_includes/forms/form-elements-1.html
+++ b/pages/_includes/forms/form-elements-1.html
@@ -31,12 +31,21 @@
 
 <div class="mb-3">
 	<label class="form-label">Input group</label>
-	<div class="input-group">
+	<div class="input-group mb-2">
 		<input type="text" class="form-control" placeholder="Search for…">
 		<span class="input-group-append">
 			<button class="btn btn-secondary" type="button">Go!</button>
 		</span>
 	</div>
+	<div class="input-group">
+		<div class="input-group-prepend">
+			<button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+				Action
+			</button>
+			{% include ui/dropdown-menu.html %}
+		</div>
+		<input type="text" class="form-control" aria-label="Text input with dropdown button">
+	</div>
 </div>
 <div class="mb-3">
 	<label class="form-label">Input group buttons</label>
diff --git a/pages/_includes/forms/form-elements-2.html b/pages/_includes/forms/form-elements-2.html
index 85c9f42b8..21d64a7e4 100644
--- a/pages/_includes/forms/form-elements-2.html
+++ b/pages/_includes/forms/form-elements-2.html
@@ -26,23 +26,9 @@
    {% include ui/form/input-group.html prepend="$" append=".00" %}
 </div>
 
-<div class="mb-3">
-   <label class="form-label">Button input</label>
-   <div class="input-group">
-      <div class="input-group-prepend">
-         <button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-            Action
-         </button>
-	      {% include ui/dropdown-menu.html %}
-      </div>
-      <input type="text" class="form-control" aria-label="Text input with dropdown button">
-   </div>
-</div>
-
 <div class="mb-3">
    <label class="form-label">Tags</label>
    {% include ui/form/selectize.html key="tags" %}
-
 </div>
 
 <div class="mb-3">
diff --git a/pages/_includes/forms/form-elements-3.html b/pages/_includes/forms/form-elements-3.html
index c2610a436..43907be98 100644
--- a/pages/_includes/forms/form-elements-3.html
+++ b/pages/_includes/forms/form-elements-3.html
@@ -4,13 +4,13 @@
 
 <div class="mb-3">
    <label class="form-label">Validation States</label>
-   <input type="text" class="form-control is-valid mb-3" placeholder="Valid State..">
+   <input type="text" class="form-control is-valid mb-2" placeholder="Valid State..">
    <input type="text" class="form-control is-invalid" placeholder="Invalid State..">
    <div class="invalid-feedback">Invalid feedback</div>
 </div>
 
 <div class="mb-3">
 	<label class="form-label">Subtle validation States</label>
-	<input type="text" class="form-control is-valid is-valid-lite mb-3" placeholder="Valid State..">
+	<input type="text" class="form-control is-valid is-valid-lite mb-2" placeholder="Valid State..">
 	<input type="text" class="form-control is-invalid is-invalid-lite" placeholder="Invalid State..">
 </div>
\ No newline at end of file
diff --git a/pages/_includes/forms/form-elements-6.html b/pages/_includes/forms/form-elements-6.html
index 2d2cd90c3..fbfaf2e62 100644
--- a/pages/_includes/forms/form-elements-6.html
+++ b/pages/_includes/forms/form-elements-6.html
@@ -1,8 +1,17 @@
 {% include parts/input-datalist.html %}
-{% include parts/input-sizes.html %}
 {% include parts/input-range.html %}
 
 <div class="mb-3">
-   <label class="form-label">Progress</label>
-   {% include ui/progress.html %}
+	<label class="form-label">Progress</label>
+	{% include ui/progress.html class="mb-2" %}
+	{% include ui/progress.html indeterminate=true color="green" %}
 </div>
+
+
+<div class="mb-3">
+	<label class="form-label">Form buttons</label>
+	<div class="btn-list">
+		{% include ui/button.html color="secondary" block=true icon="brand/github" icon-color="github" text="Login with Github" %}
+		{% include ui/button.html color="secondary" block=true icon="brand/twitter" icon-color="twitter" text="Login with Twitter" %}
+	</div>
+</div>
\ No newline at end of file
diff --git a/pages/_includes/ui/progress.html b/pages/_includes/ui/progress.html
index 7604cecde..1b8afc94b 100644
--- a/pages/_includes/ui/progress.html
+++ b/pages/_includes/ui/progress.html
@@ -2,7 +2,7 @@
 {% assign colors = include.colors | default: 'blue,red,green,yellow,dark' | split: ',' %}
 <div class="progress{% if include['size'] %} progress-{{ include['size'] }}{% endif %}{% if include.class %} {{ include.class }}{% endif %}">
    {% if include.indeterminate %}
-      <div class="progress-bar progress-bar-indeterminate"></div>
+      <div class="progress-bar progress-bar-indeterminate{% if include.color %} bg-{{ include.color }}{% endif %}"></div>
    {% elsif include.values  %}
       {% assign values = include.values | split: ',' %}
       {% for value in values %}
diff --git a/pages/form-elements.html b/pages/form-elements.html
index 2328e5be2..ce2ce9182 100644
--- a/pages/form-elements.html
+++ b/pages/form-elements.html
@@ -5,40 +5,39 @@ menu: forms
 ---
 
 <div class="row">
-   <div class="col-12">
-      <form action="https://httpbin.org/post" method="post" class="card">
-         <div class="card-header">
-            <h4 class="card-title">Form elements</h4>
-         </div>
-         <div class="card-body">
-            <div class="row">
-               <div class="col-xl-4">
-                  <div class="row">
-                     <div class="col-md-6 col-xl-12">{% include forms/form-elements-1.html %}</div>
-                     <div class="col-md-6 col-xl-12">{% include forms/form-elements-2.html %}</div>
-                  </div>
-               </div>
-               <div class="col-xl-4">
-                  <div class="row">
-                     <div class="col-md-6 col-xl-12">{% include forms/form-elements-3.html %}</div>
-                     <div class="col-md-6 col-xl-12">{% include forms/form-elements-4.html %}</div>
-                  </div>
-               </div>
-               <div class="col-xl-4">
-                  <div class="row">
-                     <div class="col-md-6 col-xl-12">{% include forms/form-elements-5.html %}</div>
-                     <div class="col-md-6 col-xl-12">{% include forms/form-elements-6.html %}</div>
-                  </div>
-               </div>
-            </div>
-         </div>
-         <div class="card-footer text-right">
-            <div class="d-flex">
-               <a href="#" class="btn btn-link">Cancel</a>
-               <button type="submit" class="btn btn-primary ml-auto">Send data</button>
-            </div>
-
-         </div>
-      </form>
-   </div>
+	<div class="col-12">
+		<form action="https://httpbin.org/post" method="post" class="card">
+			<div class="card-header">
+				<h4 class="card-title">Form elements</h4>
+			</div>
+			<div class="card-body">
+				<div class="row">
+					<div class="col-xl-4">
+						<div class="row">
+							<div class="col-md-6 col-xl-12">{% include forms/form-elements-1.html %}</div>
+							<div class="col-md-6 col-xl-12">{% include forms/form-elements-2.html %}</div>
+						</div>
+					</div>
+					<div class="col-xl-4">
+						<div class="row">
+							<div class="col-md-6 col-xl-12">{% include forms/form-elements-3.html %}</div>
+							<div class="col-md-6 col-xl-12">{% include forms/form-elements-4.html %}</div>
+						</div>
+					</div>
+					<div class="col-xl-4">
+						<div class="row">
+							<div class="col-md-6 col-xl-12">{% include forms/form-elements-5.html %}</div>
+							<div class="col-md-6 col-xl-12">{% include forms/form-elements-6.html %}</div>
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="card-footer text-right">
+				<div class="d-flex">
+					<a href="#" class="btn btn-link">Cancel</a>
+					<button type="submit" class="btn btn-primary ml-auto">Send data</button>
+				</div>
+			</div>
+		</form>
+	</div>
 </div>
diff --git a/scss/ui/_buttons.scss b/scss/ui/_buttons.scss
index 113a670a9..9c8a362cc 100644
--- a/scss/ui/_buttons.scss
+++ b/scss/ui/_buttons.scss
@@ -97,8 +97,12 @@
 
   > .btn,
   > .dropdown {
-    margin-bottom: .5rem;
-    margin-right: .5rem;
+    margin: 0 .5rem .5rem 0;
+  }
+
+  >.btn-block {
+    flex: 1;
+    white-space: nowrap;
   }
 }