diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php
index d4b4b71f4..eff4be1d8 100644
--- a/e107_handlers/e107_class.php
+++ b/e107_handlers/e107_class.php
@@ -3976,7 +3976,8 @@ class e107
 		}
 		else
 		{
-			$domain = preg_replace('/^www\./', '' ,$_SERVER['HTTP_HOST']);
+			$host = !empty($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : $_SERVER['SERVER_NAME'];
+			$domain = preg_replace('/^www\.|:\d*$/', '', $host); // remove www. and port numbers.
 
 			$dtemp = explode(".", $domain);
 
diff --git a/e107_themes/bootstrap3/admin_style.css b/e107_themes/bootstrap3/admin_style.css
index 246ebba5b..8d5fa828a 100644
--- a/e107_themes/bootstrap3/admin_style.css
+++ b/e107_themes/bootstrap3/admin_style.css
@@ -1540,13 +1540,20 @@ footer {
 
 
 
-
-
-body#admin-menus > .container-fluid > .row,
-body#admin-menus .admin-left-panel,
-
+@media only screen and (min-width : 768px) {
+    .is-table-row {
+        display: table;
+    }
+    .is-table-row [class*="col-"] {
+        float: none;
+        display: table-cell;
+        vertical-align: top;
+    }
+}
 
 /* Flex Classes */
+body#admin-menus > .container-fluid > .row,
+body#admin-menus .admin-left-panel,
 .row-flex,
 .row-flex > div[class*='col-'] {
     display: -webkit-box;