diff --git a/app/views/hq/dashboard/form.html.haml b/app/views/hq/dashboard/form.html.haml
index 4293859..e3ea832 100644
--- a/app/views/hq/dashboard/form.html.haml
+++ b/app/views/hq/dashboard/form.html.haml
@@ -1,4 +1,6 @@
-.panel
+- page 'Forms', 'forms'
+
+.panel.panel-default
   .panel-heading
     %i.icon-edit.icon-large
     Form Default
@@ -133,7 +135,7 @@
         %button.btn.btn-default{:type => 'submit'} Submit
         %a.btn{href: '#'} Cancel
 
-.panel
+.panel.panel-default
   .panel-heading
     %i.icon-edit.icon-large
     Form Horizontal
@@ -182,11 +184,11 @@
         %button.btn.btn-default{:type => 'submit'} Save
         %a.btn{href: '#'} Cancel
 
-.panel
+.panel.panel-default
   .panel-heading
     %i.icon-edit.icon-large
     Knob Inputs
   .panel-body.text-center
     %input.knob{type: 'text', value: '75', data: {width: 150, height: 150}}/
     %input.knob{type: 'text', value: '100', data: {fgColor: '#16a085', width: 150, height: 150}}/
-    %input.knob{type: 'text', value: '200', data: {fgColor: '#7f8c8d', width: 150, height: 150}}/
+    %input.knob{type: 'text', value: '200', data: {fgColor: '#7f8c8d', width: 150, height: 150}}/
\ No newline at end of file
diff --git a/app/views/hq/dashboard/tables.html.haml b/app/views/hq/dashboard/tables.html.haml
index 15b8716..de9172e 100644
--- a/app/views/hq/dashboard/tables.html.haml
+++ b/app/views/hq/dashboard/tables.html.haml
@@ -1,253 +1,237 @@
 - page 'Tables', 'tables'
 
-.panel.tables
+- content_for :toolbar do
+  .btn-group
+    %a.btn{href: '#', data: {toggle: 'toolbar-tooltip'}, title: 'Building'}
+      %i.icon-building
+    %a.btn{href: '#', data: {toggle: 'toolbar-tooltip'}, title: 'Laptop'}
+      %i.icon-laptop
+    %a.btn{href: '#', data: {toggle: 'toolbar-tooltip'}, title: 'Calendar'}
+      %i.icon-calendar
+      %span.badge 3
+    %a.btn{href: '#', data: {toggle: 'toolbar-tooltip'}, title: 'Lemon'}
+      %i.icon-lemon
+
+.panel.panel-default.grid
+
   .panel-heading
     %i.icon-table.icon-large
     Default Table
-  .panel-tools
-    .btn-group
-      %a.btn{href: '#'}
-        %i.icon-wrench
-        Settings
-      %a.btn{href: '#'}
-        %i.icon-filter
-        Filters
-      %a.btn{href: '#', data: {toggle: 'toolbar-tooltip'}, title: 'Reload'}
-        %i.icon-refresh
-    .badge 3 record
-  .panel-body.no-padding
-    .table-header.row
-      .col-lg-9
-        TODO: Add filters here
-      .col-lg-3
+
+    .panel-tools
+      .btn-group
+        %a.btn{href: '#'}
+          %i.icon-wrench
+          Settings
+        %a.btn{href: '#'}
+          %i.icon-filter
+          Filters
+        %a.btn{href: '#', data: {toggle: 'toolbar-tooltip'}, title: 'Reload'}
+          %i.icon-refresh
+      .badge 3 record
+
+  .panel-body.filters
+    .row
+      .col-md-9
+        Add your custom filters here...
+      .col-md-3
         .input-group
           %input.form-control{placeholder: 'Quick search...', type: 'text'}/
           %span.input-group-btn
             %button.btn{type: 'button'}
               %i.icon-search
-    %table.table
-      %thead
-        %tr
-          %th #
-          %th First Name
-          %th Last Name
-          %th Username
-          %th.actions
-            Actions
-      %tbody
-        %tr.success
-          %td 1
-          %td Mark
-          %td Otto
-          %td @mdo
-          %td.action
-            %a.btn.btn-success{href: '#', data: {toggle: 'tooltip'}, title: 'Zoom'}
-              %i.icon-zoom-in
-            %a.btn.btn-info{href: '#'}
-              %i.icon-edit
-            %a.btn.btn-danger{href: '#'}
-              %i.icon-trash
-        %tr.danger
-          %td 2
-          %td Jacob
-          %td Thornton
-          %td @fat
-          %td.action
-            %a.btn.btn-success{href: '#', data: {toggle: 'tooltip'}, title: 'Zoom'}
-              %i.icon-zoom-in
-            %a.btn.btn-info{href: '#'}
-              %i.icon-edit
-            %a.btn.btn-danger{href: '#'}
-              %i.icon-trash
-        %tr.warning
-          %td 3
-          %td Larry
-          %td the Bird
-          %td @twitter
-          %td.action
-            %a.btn.btn-success{href: '#', data: {toggle: 'tooltip'}, title: 'Zoom'}
-              %i.icon-zoom-in
-            %a.btn.btn-info{href: '#'}
-              %i.icon-edit
-            %a.btn.btn-danger{href: '#'}
-              %i.icon-trash
-        %tr.active
-          %td 4
-          %td Mark
-          %td Otto
-          %td @mdo
-          %td.action
-            %a.btn.btn-success{href: '#', data: {toggle: 'tooltip'}, title: 'Zoom'}
-              %i.icon-zoom-in
-            %a.btn.btn-info{href: '#'}
-              %i.icon-edit
-            %a.btn.btn-danger{href: '#'}
-              %i.icon-trash
-        %tr.disabled
-          %td 5
-          %td Jacob
-          %td Thornton
-          %td @fat
-          %td.action
-            %a.btn.btn-success{href: '#', data: {toggle: 'tooltip'}, title: 'Zoom'}
-              %i.icon-zoom-in
-            %a.btn.btn-info{href: '#'}
-              %i.icon-edit
-            %a.btn.btn-danger{href: '#'}
-              %i.icon-trash
-        %tr
-          %td 6
-          %td Larry
-          %td the Bird
-          %td @twitter
-          %td.action
-            %a.btn.btn-success{href: '#', data: {toggle: 'tooltip'}, title: 'Zoom'}
-              %i.icon-zoom-in
-            %a.btn.btn-info{href: '#'}
-              %i.icon-edit
-            %a.btn.btn-danger{href: '#'}
-              %i.icon-trash
-        %tr
-          %td 7
-          %td Jacob
-          %td Thornton
-          %td @fat
-          %td.action
-            %a.btn.btn-success{href: '#', data: {toggle: 'tooltip'}, title: 'Zoom'}
-              %i.icon-zoom-in
-            %a.btn.btn-info{href: '#'}
-              %i.icon-edit
-            %a.btn.btn-danger{href: '#'}
-              %i.icon-trash
-        %tr
-          %td 8
-          %td Larry
-          %td the Bird
-          %td @twitter
-          %td.action
-            %a.btn.btn-success{href: '#', data: {toggle: 'tooltip'}, title: 'Zoom'}
-              %i.icon-zoom-in
-            %a.btn.btn-info{href: '#'}
-              %i.icon-edit
-            %a.btn.btn-danger{href: '#'}
-              %i.icon-trash
-        %tr
-          %td 9
-          %td Mark
-          %td Otto
-          %td @mdo
-          %td.action
-            %a.btn.btn-success{href: '#', data: {toggle: 'tooltip'}, title: 'Zoom'}
-              %i.icon-zoom-in
-            %a.btn.btn-info{href: '#'}
-              %i.icon-edit
-            %a.btn.btn-danger{href: '#'}
-              %i.icon-trash
-        %tr
-          %td 10
-          %td Jacob
-          %td Thornton
-          %td @fat
-          %td.action
-            %a.btn.btn-success{href: '#', data: {toggle: 'tooltip'}, title: 'Zoom'}
-              %i.icon-zoom-in
-            %a.btn.btn-info{href: '#'}
-              %i.icon-edit
-            %a.btn.btn-danger{href: '#'}
-              %i.icon-trash
 
-    .table-footer
-      %ul.pagination
-        %li
-          %a{:href => '#'} «
-        %li.active
-          %a{:href => '#'} 1
-        %li
-          %a{:href => '#'} 2
-        %li
-          %a{:href => '#'} 3
-        %li
-          %a{:href => '#'} 4
-        %li
-          %a{:href => '#'} 5
-        %li
-          %a{:href => '#'} 6
-        %li
-          %a{:href => '#'} 7
-        %li
-          %a{:href => '#'} 8
-        %li
-          %a{:href => '#'} »
-      .pull-right
-        Showing 1 to 10 of 32 entries
+  %table.table
+    %thead
+      %tr
+        %th #
+        %th First Name
+        %th Last Name
+        %th Username
+        %th.actions
+          Actions
+    %tbody
+      %tr.success
+        %td 1
+        %td Mark
+        %td Otto
+        %td @mdo
+        %td.action
+          %a.btn.btn-success{href: '#', data: {toggle: 'tooltip'}, title: 'Zoom'}
+            %i.icon-zoom-in
+          %a.btn.btn-info{href: '#'}
+            %i.icon-edit
+          %a.btn.btn-danger{href: '#'}
+            %i.icon-trash
+      %tr.danger
+        %td 2
+        %td Jacob
+        %td Thornton
+        %td @fat
+        %td.action
+          %a.btn.btn-success{href: '#', data: {toggle: 'tooltip'}, title: 'Zoom'}
+            %i.icon-zoom-in
+          %a.btn.btn-info{href: '#'}
+            %i.icon-edit
+          %a.btn.btn-danger{href: '#'}
+            %i.icon-trash
+      %tr.warning
+        %td 3
+        %td Larry
+        %td the Bird
+        %td @twitter
+        %td.action
+          %a.btn.btn-success{href: '#', data: {toggle: 'tooltip'}, title: 'Zoom'}
+            %i.icon-zoom-in
+          %a.btn.btn-info{href: '#'}
+            %i.icon-edit
+          %a.btn.btn-danger{href: '#'}
+            %i.icon-trash
+      %tr.active
+        %td 4
+        %td Mark
+        %td Otto
+        %td @mdo
+        %td.action
+          %a.btn.btn-success{href: '#', data: {toggle: 'tooltip'}, title: 'Zoom'}
+            %i.icon-zoom-in
+          %a.btn.btn-info{href: '#'}
+            %i.icon-edit
+          %a.btn.btn-danger{href: '#'}
+            %i.icon-trash
+      %tr.disabled
+        %td 5
+        %td Jacob
+        %td Thornton
+        %td @fat
+        %td.action
+          %a.btn.btn-success{href: '#', data: {toggle: 'tooltip'}, title: 'Zoom'}
+            %i.icon-zoom-in
+          %a.btn.btn-info{href: '#'}
+            %i.icon-edit
+          %a.btn.btn-danger{href: '#'}
+            %i.icon-trash
+      %tr
+        %td 6
+        %td Larry
+        %td the Bird
+        %td @twitter
+        %td.action
+          %a.btn.btn-success{href: '#', data: {toggle: 'tooltip'}, title: 'Zoom'}
+            %i.icon-zoom-in
+          %a.btn.btn-info{href: '#'}
+            %i.icon-edit
+          %a.btn.btn-danger{href: '#'}
+            %i.icon-trash
+      %tr
+        %td 7
+        %td Jacob
+        %td Thornton
+        %td @fat
+        %td.action
+          %a.btn.btn-success{href: '#', data: {toggle: 'tooltip'}, title: 'Zoom'}
+            %i.icon-zoom-in
+          %a.btn.btn-info{href: '#'}
+            %i.icon-edit
+          %a.btn.btn-danger{href: '#'}
+            %i.icon-trash
+      %tr
+        %td 8
+        %td Larry
+        %td the Bird
+        %td @twitter
+        %td.action
+          %a.btn.btn-success{href: '#', data: {toggle: 'tooltip'}, title: 'Zoom'}
+            %i.icon-zoom-in
+          %a.btn.btn-info{href: '#'}
+            %i.icon-edit
+          %a.btn.btn-danger{href: '#'}
+            %i.icon-trash
+      %tr
+        %td 9
+        %td Mark
+        %td Otto
+        %td @mdo
+        %td.action
+          %a.btn.btn-success{href: '#', data: {toggle: 'tooltip'}, title: 'Zoom'}
+            %i.icon-zoom-in
+          %a.btn.btn-info{href: '#'}
+            %i.icon-edit
+          %a.btn.btn-danger{href: '#'}
+            %i.icon-trash
+      %tr
+        %td 10
+        %td Jacob
+        %td Thornton
+        %td @fat
+        %td.action
+          %a.btn.btn-success{href: '#', data: {toggle: 'tooltip'}, title: 'Zoom'}
+            %i.icon-zoom-in
+          %a.btn.btn-info{href: '#'}
+            %i.icon-edit
+          %a.btn.btn-danger{href: '#'}
+            %i.icon-trash
 
-.row
-  .col-lg-6
-    .panel.tables
-      .panel-heading
-        %i.icon-table.icon-large
-        Padding Table
-      .panel-body
-        %table.table
-          %thead
-            %tr
-              %th #
-              %th First Name
-              %th Last Name
-              %th Username
-          %tbody
-            %tr
-              %td 1
-              %td Mark
-              %td Otto
-              %td @mdo
-            %tr
-              %td 2
-              %td Jacob
-              %td Thornton
-              %td @fat
-            %tr
-              %td 3
-              %td Larry
-              %td the Bird
-              %td @twitter
-  .col-lg-6
-    .panel.tables
-      .panel-heading
-        %i.icon-table.icon-large
-        Bordered Table
-      .panel-body
-        %table.table.table-bordered
-          %thead
-            %tr
-              %th #
-              %th First Name
-              %th Last Name
-              %th Username
-          %tbody
-            %tr
-              %td 1
-              %td Mark
-              %td Otto
-              %td @mdo
-            %tr
-              %td 2
-              %td Jacob
-              %td Thornton
-              %td @fat
-            %tr
-              %td 3
-              %td Larry
-              %td the Bird
-              %td @twitter
+  .panel-footer
+    %ul.pagination.pagination-sm
+      %li
+        %a{:href => '#'} «
+      %li.active
+        %a{:href => '#'} 1
+      %li
+        %a{:href => '#'} 2
+      %li
+        %a{:href => '#'} 3
+      %li
+        %a{:href => '#'} 4
+      %li
+        %a{:href => '#'} 5
+      %li
+        %a{:href => '#'} 6
+      %li
+        %a{:href => '#'} 7
+      %li
+        %a{:href => '#'} 8
+      %li
+        %a{:href => '#'} »
+    .pull-right
+      Showing 1 to 10 of 32 entries
+
+.panel.panel-default.grid
+  .panel-heading
+    %i.icon-table.icon-large
+    Padding Table
 
+  %table.table
+    %thead
+      %tr
+        %th #
+        %th First Name
+        %th Last Name
+        %th Username
+    %tbody
+      %tr
+        %td 1
+        %td Mark
+        %td Otto
+        %td @mdo
+      %tr
+        %td 2
+        %td Jacob
+        %td Thornton
+        %td @fat
+      %tr
+        %td 3
+        %td Larry
+        %td the Bird
+        %td @twitter
 
-.panel.tables
+.panel.panel-default.grid
   .panel-heading
     %i.icon-table.icon-large
-    Condensed Table
-  .panel-body.no-padding
-    %table.table.table-condensed
+    Bordered Table
+  .panel-body
+    %table.table.table-bordered
       %thead
         %tr
           %th #
@@ -269,4 +253,33 @@
           %td 3
           %td Larry
           %td the Bird
-          %td @twitter
\ No newline at end of file
+          %td @twitter
+
+
+.panel.panel-default.grid
+  .panel-heading
+    %i.icon-table.icon-large
+    Condensed Table
+  %table.table.table-condensed
+    %thead
+      %tr
+        %th #
+        %th First Name
+        %th Last Name
+        %th Username
+    %tbody
+      %tr
+        %td 1
+        %td Mark
+        %td Otto
+        %td @mdo
+      %tr
+        %td 2
+        %td Jacob
+        %td Thornton
+        %td @fat
+      %tr
+        %td 3
+        %td Larry
+        %td the Bird
+        %td @twitter
\ No newline at end of file