diff --git a/pages/_includes/cards/charts/active-users.html b/pages/_includes/cards/charts/active-users.html
index 2fdd02551..a5595332d 100644
--- a/pages/_includes/cards/charts/active-users.html
+++ b/pages/_includes/cards/charts/active-users.html
@@ -2,7 +2,7 @@
    <div class="card-body">
       <div class="d-flex align-items-center">
          <div class="subheader">Active users</div>
-         <div class="ml-auto">
+         <div class="ml-auto lh-1">
             {% include parts/dropdown/days.html %}
          </div>
       </div>
diff --git a/pages/_includes/cards/charts/new-clients.html b/pages/_includes/cards/charts/new-clients.html
index a9d580670..9228873c3 100644
--- a/pages/_includes/cards/charts/new-clients.html
+++ b/pages/_includes/cards/charts/new-clients.html
@@ -2,7 +2,7 @@
    <div class="card-body">
       <div class="d-flex align-items-center">
          <div class="subheader">New clients</div>
-         <div class="ml-auto">
+         <div class="ml-auto lh-1">
             {% include parts/dropdown/days.html %}
          </div>
       </div>
diff --git a/pages/_includes/cards/charts/revenue.html b/pages/_includes/cards/charts/revenue.html
index 7e170d50f..2e6f7d635 100644
--- a/pages/_includes/cards/charts/revenue.html
+++ b/pages/_includes/cards/charts/revenue.html
@@ -2,7 +2,7 @@
    <div class="card-body">
       <div class="d-flex align-items-center">
          <div class="subheader">Revenue</div>
-         <div class="ml-auto">
+         <div class="ml-auto lh-1">
             {% include parts/dropdown/days.html %}
          </div>
       </div>
diff --git a/pages/_includes/cards/charts/sales.html b/pages/_includes/cards/charts/sales.html
index 92e63783d..1e4961797 100644
--- a/pages/_includes/cards/charts/sales.html
+++ b/pages/_includes/cards/charts/sales.html
@@ -2,7 +2,7 @@
    <div class="card-body">
       <div class="d-flex align-items-center">
          <div class="subheader">Sales</div>
-         <div class="ml-auto">
+         <div class="ml-auto lh-1">
             {% include parts/dropdown/days.html %}
          </div>
       </div>
diff --git a/pages/_includes/cards/invoices.html b/pages/_includes/cards/invoices.html
index 41c609c73..5746dd9ea 100644
--- a/pages/_includes/cards/invoices.html
+++ b/pages/_includes/cards/invoices.html
@@ -35,7 +35,6 @@
 				<th>Status {% include ui/icon.html icon="code" class="icon-sm" %}</th>
 				<th>Price {% include ui/icon.html icon="code" class="icon-sm" %}</th>
 				<th></th>
-				<th></th>
 			</tr>
 			</thead>
 
@@ -67,9 +66,6 @@
 						{% include ui/dropdown-menu.html right=true %}
 					</span>
 				</td>
-				<td>
-					{% include ui/icon.html icon="edit" class="icon-sm float-right" %}
-				</td>
 			</tr>
 			{% endfor %}
 			</tbody>
diff --git a/pages/_includes/cards/table-users.html b/pages/_includes/cards/table-users.html
index 0b37c5f52..5cd583681 100644
--- a/pages/_includes/cards/table-users.html
+++ b/pages/_includes/cards/table-users.html
@@ -8,7 +8,6 @@
 				<th class="text-center">Payment</th>
 				<th>Activity</th>
 				<th class="w-1p">Satisfaction</th>
-				<th class="w-1p"></th>
 			</tr>
 			</thead>
 			<tbody>
@@ -59,14 +58,6 @@
 <!--					</div>-->
 					{% include ui/sparkline.html percentage=percentage type="pie" %}
 				</td>
-				<td class="text-center">
-					<div class="dropdown">
-						<a href="#" class="text-secondary mx-2" data-boundary="viewport" data-toggle="dropdown">
-							{% include ui/icon.html icon="more-vertical" %}
-						</a>
-						{% include ui/dropdown-menu.html right=true %}
-					</div>
-				</td>
 			</tr>
 			{% endfor %}
 			</tbody>
diff --git a/pages/_includes/layout/footer-sub.html b/pages/_includes/layout/footer-sub.html
deleted file mode 100644
index 7a87a96ed..000000000
--- a/pages/_includes/layout/footer-sub.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<div class="layout-area-footer-sub footer">   
-    <div class="container">
-            <div class="row">
-                <div class="col-lg-8">
-                    <div class="row">
-                        <div class="col-6 col-md-3">
-                            <ul class="list-unstyled mb-0">
-                                <li><a href="#">First link</a></li>
-                                <li><a href="#">Second link</a></li>
-                            </ul>
-                        </div>
-                        <div class="col-6 col-md-3">
-                            <ul class="list-unstyled mb-0">
-                                <li><a href="#">Third link</a></li>
-                                <li><a href="#">Fourth link</a></li>
-                            </ul>
-                        </div>
-                        <div class="col-6 col-md-3">
-                            <ul class="list-unstyled mb-0">
-                                <li><a href="#">Fifth link</a></li>
-                                <li><a href="#">Sixth link</a></li>
-                            </ul>
-                        </div>
-                        <div class="col-6 col-md-3">
-                            <ul class="list-unstyled mb-0">
-                                <li><a href="#">Other link</a></li>
-                                <li><a href="#">Last link</a></li>
-                            </ul>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-lg-4 mt-4 mt-lg-0">
-                    Premium and Open Source dashboard template with responsive and high quality UI. For Free!
-                </div>
-            </div>
-        </div>
-    </div>
\ No newline at end of file
diff --git a/pages/_includes/layout/footer.html b/pages/_includes/layout/footer.html
index 1b75a2f6b..93696bf27 100644
--- a/pages/_includes/layout/footer.html
+++ b/pages/_includes/layout/footer.html
@@ -1,22 +1,26 @@
-<footer class="layout-area-footer footer py-1">
-        <div class="container">
-            <div class="row align-items-center flex-row-reverse">
-                <div class="col-auto ml-lg-auto">
-                    <div class="row align-items-center">
-                        <div class="col-auto">
-                            <ul class="list-inline list-inline-dots mb-0">
-                                <li class="list-inline-item"><a href="{{ site.base }}/docs/index.html">Documentation</a></li>
-                                <li class="list-inline-item"><a href="{{ site.base }}/faq.html">FAQ</a></li>
-                            </ul>
-                        </div>
-                        <div class="col-auto">
-                            <a href="{{ site.github_url }}" class="btn btn-outline-primary btn-sm">Source code</a>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-12 col-lg-auto mt-3 mt-lg-0 text-center">
-                    Copyright © {{ site.time | date: '%Y' }} <a href="{{ site.base }}">{{ site.title }}</a>. Theme by <a href="{{ site.author.url }}" target="_blank">{{ site.author.name }}</a> All rights reserved.
-                </div>
-            </div>
-        </div>
-    </footer>
\ No newline at end of file
+<div class="mb-n3 mt-3">
+	<footer class="footer">
+		<div class="container">
+			<div class="row align-items-center flex-row-reverse">
+				<div class="col-auto ml-lg-auto">
+					<div class="row align-items-center">
+						<div class="col-auto">
+							<ul class="list-inline list-inline-dots mb-0">
+								<li class="list-inline-item"><a href="{{ site.base }}/docs/index.html" class="link-secondary">Documentation</a></li>
+								<li class="list-inline-item"><a href="{{ site.base }}/faq.html" class="link-secondary">FAQ</a></li>
+							</ul>
+						</div>
+						<div class="col-auto">
+							{% include ui/button.html color="secondary" size="sm" text="Source code" href=site.github_url external=true %}
+						</div>
+					</div>
+				</div>
+				<div class="col-12 col-lg-auto mt-3 mt-lg-0 text-center">
+					Copyright © {{ site.time | date: '%Y' }}
+					<a href="{{ site.base }}" class="link-secondary">{{ site.title }}</a>.
+					All rights reserved.
+				</div>
+			</div>
+		</div>
+	</footer>
+</div>
\ No newline at end of file
diff --git a/pages/_layouts/default.html b/pages/_layouts/default.html
index 273638381..4146257c1 100644
--- a/pages/_layouts/default.html
+++ b/pages/_layouts/default.html
@@ -9,15 +9,14 @@ layout: base
 	{% include layout/navbar-secondary.html %}
 
 	<div class="content">
-		<main class="container">
+		<div class="container">
 			{% if page-header %}
 				{% include layout/page-header.html title=page-header description=page.page-header-description actions=page.page-header-actions pretitle=page.page-header-pretitle %}
 			{% endif %}
 
 			{{ content }}
-		</main>
+		</div>
 
-		{% include layout/footer-sub.html %}
 		{% include layout/footer.html %}
 	</div>
 </div>
diff --git a/scss/_tabler-core.scss b/scss/_tabler-core.scss
index 6b21246e7..e99632d57 100644
--- a/scss/_tabler-core.scss
+++ b/scss/_tabler-core.scss
@@ -6,6 +6,7 @@
 @import "layout/core";
 @import "layout/navbar";
 @import "layout/page";
+@import "layout/footer";
 
 @import "ui/alerts";
 @import "ui/avatars";
diff --git a/scss/layout/_footer.scss b/scss/layout/_footer.scss
index a9f5b3164..8b7d383ad 100644
--- a/scss/layout/_footer.scss
+++ b/scss/layout/_footer.scss
@@ -1,6 +1,6 @@
 .footer {
-    border-top: 1px solid;
-    background-color: $footer-bg;
-    border-color: $footer-border-color;
-    padding: 0.75rem;
+  border-top: 1px solid $footer-border-color;
+  background-color: $footer-bg;
+  padding: 1rem 0;
+  color: $text-muted;
 }
\ No newline at end of file
diff --git a/scss/layout/_page.scss b/scss/layout/_page.scss
index cbef0efa9..2ef6c1a7c 100644
--- a/scss/layout/_page.scss
+++ b/scss/layout/_page.scss
@@ -2,15 +2,18 @@
   display: flex;
   flex-direction: column;
   position: relative;
+  min-height: 100vh;
 }
 
 .content {
   padding-top: 1.25rem;
   padding-bottom: 1.25rem;
+  flex: 1;
+  display: flex;
+  flex-direction: column;
 
-  @include media-breakpoint-up(xl) {
-    padding-left: .5rem;
-    padding-right: .5rem;
+  >[class*="container"] {
+    flex: 1;
   }
 
   @media print {
diff --git a/scss/ui/_lists.scss b/scss/ui/_lists.scss
index 21adb4885..743f0fcf8 100644
--- a/scss/ui/_lists.scss
+++ b/scss/ui/_lists.scss
@@ -182,3 +182,14 @@
     border-top: 1px solid $border-color;
   }
 }
+
+/**
+Inline list
+ */
+
+.list-inline-dots {
+  .list-inline-item + .list-inline-item:before {
+      content: '· ';
+      margin-right: $list-inline-padding;
+  }
+}
\ No newline at end of file