diff --git a/awx/ui/static/js/helpers/inventory.js b/awx/ui/static/js/helpers/inventory.js
index 9fe27a5596..0c6b0ec5be 100644
--- a/awx/ui/static/js/helpers/inventory.js
+++ b/awx/ui/static/js/helpers/inventory.js
@@ -30,15 +30,15 @@ angular.module('InventoryHelper', ['RestServices', 'Utilities', 'OrganizationLis
             $('.site-footer').outerHeight() - $('.group-breadcrumbs').outerHeight() - $('#groups-container #search-widget-container').outerHeight() -
             $('#groups_table thead').height() ));
       */
-        return $(window).height() - $('.main-menu').outerHeight() - $('#main_tabs').outerHeight() - $('#breadcrumbs').outerHeight() -
+        return $(window).height() - $('#main-menu-container .navbar').outerHeight() - $('#breadcrumbs').outerHeight() -
             $('.site-footer').outerHeight() - $('.group-breadcrumbs').outerHeight() - $('#groups-container #search-widget-container').outerHeight() -
-            $('#groups_table thead').height() - 70;
+            $('#groups_table thead').height() - 90;
     };
 }])
 
 .factory('GetHostContainerRows', [ function() {
     return function() {
-        var height = $('#hosts-container .well').height() - $('#hosts-constainer .well .row').height() - $('#hosts_table thead').height();
+        var height = $('#hosts-container .list-well').height() - $('#hosts-constainer .list-well .row').height() - $('#hosts_table thead').height();
         return Math.floor(height / 30) - 2;
     };
 }])
@@ -59,11 +59,12 @@ angular.module('InventoryHelper', ['RestServices', 'Utilities', 'OrganizationLis
         if ($(window).width() > 1210) {
             height = GetGroupContainerHeight();
             $('#groups-container .list-table-container').height(height);
-            $('#hosts-container .well').height( $('#groups-container .well').height());
+            $('#hosts-container .list-table-container').height(height);
+            setTimeout(function() { $('#hosts-container .list-well').height( $('#groups-container .list-well').outerHeight()); }, 500);
         }
         else {
             $('#groups-container .list-table-container').height('auto');
-            $('#hosts-container .well').height('auto');
+            $('#hosts-container .list-well').height('auto');
         }
         //$('#groups-container .list-table-container').mCustomScrollbar("update");
 
diff --git a/awx/ui/static/less/ansible-ui.less b/awx/ui/static/less/ansible-ui.less
index 8871ccc567..3edc5c95ca 100644
--- a/awx/ui/static/less/ansible-ui.less
+++ b/awx/ui/static/less/ansible-ui.less
@@ -396,31 +396,6 @@ dd {
   min-height: 15px;
 }
 
-/* The sticky footer: http://css-tricks.com/snippets/css/sticky-footer, with less variables */
-  @footer-height: 68px;
-  @footer-margin: 22px;
-  @push-height: (@footer-height + @footer-margin);
-  #wrap {
-      min-height: 100%;
-      height: 100%;
-      height: auto !important;
-      margin-bottom: -(@push-height);
-  }
-  #wrap:after {
-      content: "";
-      display: block;
-  }
-
-  #wrap:after {
-      height: @push-height;
-  }
-
-  .site-footer {
-      height: @footer-height;
-      margin-top: @footer-margin;
-  }
-
-
 #navbar-container, .main-menu {
   width: 100%;
   background-color: @black;
@@ -455,43 +430,6 @@ dd {
   background-color: @black;
 }
 
-.site-footer {
-    color: @grey;
-    text-align: center;
-    padding-top: 10px;
-    padding-bottom: 10px;
-    font-size: 12px;
-
-    a,
-    a:active,
-    a:visited {
-        color: @grey;
-    }
-
-    a:hover {
-        color: @blue;
-    }
-
-    .help {
-        padding-top: 14px;
-        font-weight: normal;
-    }
-
-    .logo {
-        text-align: right;
-    }
-
-    .logo img {
-        max-width: 46px;
-    }
-
-    .copyright {
-        padding-top: 6px;
-        font-weight: normal;
-        text-align: center;
-    }
-}
-
 .modal-header.login-header {
     text-align: center;
     background-color: @black;
@@ -1736,35 +1674,6 @@ tr td button i {
 
 @media (max-width: 767px) {
 
-  /* The sticky footer: http://css-tricks.com/snippets/css/sticky-footer, with less variables */
-  @footer-height: 140px;
-  @footer-margin: 15px;
-  @push-height: (@footer-height + @footer-margin);
-  #wrap {
-      min-height: 100%;
-      height: 100%;
-      height: auto !important;
-      margin-bottom: -(@push-height);
-  }
-  #wrap:after {
-      content: "";
-      display: block;
-  }
-  #wrap:after {
-      height: @push-height;
-  }
-  .site-footer {
-      height: @footer-height;
-      margin-top: @footer-margin;
-      padding-top: 5px;
-      padding-bottom: 5px;
-      .logo {
-          text-align: center;
-          padding-top: 10px;
-          margin-bottom: 10px;
-      }
-  }
-
   /* Job events */
 
   .level-1,
diff --git a/awx/ui/static/less/main-layout.less b/awx/ui/static/less/main-layout.less
index 058814ae57..d6b932d35b 100644
--- a/awx/ui/static/less/main-layout.less
+++ b/awx/ui/static/less/main-layout.less
@@ -72,6 +72,10 @@ body {
     margin-right: 5px;
 }
 
+.site-footer {
+    height: 15px;
+}
+
 @media (max-width: 1075px) {
 
     #main-menu-container {
diff --git a/awx/ui/static/partials/inventory-edit.html b/awx/ui/static/partials/inventory-edit.html
index 9e69e32a2d..e49043a892 100644
--- a/awx/ui/static/partials/inventory-edit.html
+++ b/awx/ui/static/partials/inventory-edit.html
@@ -1,7 +1,7 @@
 <div class="tab-pane" id="inventory_edit">
     <div ng-cloak id="htmlTemplate">
 
-        <ul class="ansible-breadcrumb">
+        <ul class="ansible-breadcrumb" id="#breadcrumbs">
             <li><a href="#/inventories">Inventories</a></li>
             <li><a href="">{{ inventory.name }}</a></li>
             <li ng-repeat="group_breadcrumb in group_breadcrumbs" ng-class="group_breadcrumb.active_class"><a href="" ng-click="breadcrumbGroupSelect(group_breadcrumb.id)">{{ group_breadcrumb.name }}</a></li>
diff --git a/awx/ui/templates/ui/index.html b/awx/ui/templates/ui/index.html
index cf79d47651..70b091a4de 100644
--- a/awx/ui/templates/ui/index.html
+++ b/awx/ui/templates/ui/index.html
@@ -417,6 +417,7 @@
     </div>
 </div>
 -->
+<div class="site-footer"></div>
 
   <script src="{{ STATIC_URL }}lib/jqueryui/ui/minified/jquery-ui.min.js"></script>
   <script src="{{ STATIC_URL }}lib/bootstrap/dist/js/bootstrap.min.js"></script>