diff --git a/ProjectLighthouse/Pages/Layouts/BaseLayout.cshtml b/ProjectLighthouse/Pages/Layouts/BaseLayout.cshtml
index d1bd9f16..ee35c549 100644
--- a/ProjectLighthouse/Pages/Layouts/BaseLayout.cshtml
+++ b/ProjectLighthouse/Pages/Layouts/BaseLayout.cshtml
@@ -63,6 +63,8 @@
         <meta content="@Model.Description" property="og:description">
     }
 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
     @* Google Analytics *@
     @if (ServerSettings.Instance.GoogleAnalyticsEnabled)
     {
@@ -93,14 +95,21 @@
     <header class="lighthouse-header">
         <div class="ui attached menu">
             <div class="ui container">
+                @{
+                    string mobileIconStyle = Model.IsMobile ? "margin-right: 0;" : "";
+                }
                 @foreach (PageNavigationItem navigationItem in Model!.NavigationItems)
                 {
                     <a class="item" href="@navigationItem.Url">
                         @if (navigationItem.Icon != null)
                         {
-                            <i class="@navigationItem.Icon icon"></i>
+                            <i class="@navigationItem.Icon icon" style="@mobileIconStyle"></i>
+                        }
+
+                        @if (!Model.IsMobile)
+                        {
+                            @navigationItem.Name
                         }
-                        @navigationItem.Name
                     </a>
                 }
                 <div class="right menu">
@@ -109,9 +118,13 @@
                         <a class="item" href="@navigationItem.Url">
                             @if (navigationItem.Icon != null)
                             {
-                                <i class="@navigationItem.Icon icon"></i>
+                                <i class="@navigationItem.Icon icon" style="@mobileIconStyle"></i>
+                            }
+
+                            @if (!Model.IsMobile)
+                            {
+                                @navigationItem.Name
                             }
-                            @navigationItem.Name
                         </a>
                     }
                 </div>
@@ -163,10 +176,12 @@
                         <b>Show/Hide Debug Info</b>
                     </button>
 
-                    <div style="display:none">
+                    <div style="display:none" id="lighthouse-debug-info">
+                        <br>
                         <p>Model.IsMobile: @Model.IsMobile</p>
                         <p>Model.Title: @Model.Title</p>
                         <p>Model.Description: @Model.Description</p>
+                        <p>Model.User.UserId: @(Model.User?.UserId.ToString() ?? "(not logged in)")</p>
                         <p>Render time: ~@(TimestampHelper.TimestampMillis - timeStarted)ms</p>
                     </div>
                 </div>
diff --git a/ProjectLighthouse/StaticFiles/css/styles.css b/ProjectLighthouse/StaticFiles/css/styles.css
index 53cbfaa5..18d37154 100644
--- a/ProjectLighthouse/StaticFiles/css/styles.css
+++ b/ProjectLighthouse/StaticFiles/css/styles.css
@@ -16,3 +16,6 @@ div.statsUnderTitle > span {
     margin-right: 5px;
 }
 
+#lighthouse-debug-info > p {
+    margin-bottom: 1px;
+}
\ No newline at end of file