diff --git a/dashboard-ui/css/images/checkmarkgreen.png b/dashboard-ui/css/images/checkmarkgreen.png
index c88c14578d..ac4915dc69 100644
Binary files a/dashboard-ui/css/images/checkmarkgreen.png and b/dashboard-ui/css/images/checkmarkgreen.png differ
diff --git a/dashboard-ui/dashboard.html b/dashboard-ui/dashboard.html
index 357bf1102f..9264c29524 100644
--- a/dashboard-ui/dashboard.html
+++ b/dashboard-ui/dashboard.html
@@ -4,7 +4,7 @@
     <title>Dashboard</title>
 </head>
 <body>
-    <div id="dashboardPage" data-role="page" class="page type-interior adminPage">
+    <div id="dashboardPage" data-role="page" class="page type-interior adminPage dashboardHomePage">
 
         <div data-role="content">
             <div class="content-primary">
@@ -23,7 +23,7 @@
                                     Version <span id="appVersionNumber"></span>
                                 </p>
                                 <p id="pUpToDate" style="display: none;">
-                                    <img src="css/images/checkmarkgreen.png" style="height: 20px; margin-right: 3px; position: relative; top: 4px;" />
+                                    <img src="css/images/checkmarkgreen.png" style="height: 20px; margin-right: 3px; position: relative; top: 5px; border-radius: 3px;" />
                                     Media Browser Server is up to date
                                 </p>
                                 <div id="pUpdateNow" style="display: none;">
@@ -40,6 +40,7 @@
                                 <p id="ports"></p>
                                 <div id="pPluginUpdates"></div>
 
+                                <p class="externalUrl"></p>
                                 <div style="margin-top: 1em;">
                                     <button class="btnRestartContainer hide" id="btnRestartServer" type="button" data-icon="refresh" data-mini="true" data-inline="true" onclick="DashboardPage.restart();">Restart</button>
                                     <button id="btnShutdown" type="button" data-icon="delete" data-mini="true" data-inline="true" onclick="DashboardPage.shutdown();">Shutdown</button>
diff --git a/dashboard-ui/dashboardinfopage.html b/dashboard-ui/dashboardinfopage.html
index 803b573320..14dd7e3441 100644
--- a/dashboard-ui/dashboardinfopage.html
+++ b/dashboard-ui/dashboardinfopage.html
@@ -4,7 +4,7 @@
     <title>Dashboard</title>
 </head>
 <body>
-    <div id="dashboardInfoPage" data-role="page" class="page type-interior adminPage">
+    <div id="dashboardInfoPage" data-role="page" class="page type-interior adminPage dashboardHomePage">
 
         <div data-role="content">
             <div class="content-primary">
@@ -18,8 +18,6 @@
                     <div data-role="collapsible" data-collapsed="false" style="margin-top: 1em;">
                         <h3>Links</h3>
                         <div>
-                            <p>Bookmark url: <a id="bookmarkUrl" href="#" data-ajax="false"></a></p>
-                            <p class="externalUrl"></p>
                             <p><a href="http://mediabrowser3.com/community" target="_blank">Community</a> - Join us!</p>
                             <p><a href="https://github.com/MediaBrowser/MediaBrowser" target="_blank">Github</a></p>
                             <p><a href="../swagger-ui/index.html" target="_blank">Api Documentation</a></p>
diff --git a/dashboard-ui/scripts/dashboardinfo.js b/dashboard-ui/scripts/dashboardinfo.js
index c940cbac49..5044e8d598 100644
--- a/dashboard-ui/scripts/dashboardinfo.js
+++ b/dashboard-ui/scripts/dashboardinfo.js
@@ -7,15 +7,11 @@
         $('#imagesByNamePath', page).html(systemInfo.ItemsByNamePath);
         $('#transcodingTemporaryPath', page).html(systemInfo.TranscodingTempPath);
 
-        var url = ApiClient.serverAddress() + "/mediabrowser";
-
-        $('#bookmarkUrl', page).html(url).attr("href", url);
-
         if (systemInfo.WanAddress) {
 
             var externalUrl = systemInfo.WanAddress + "/mediabrowser";
 
-            $('.externalUrl', page).html('External url: <a href="' + externalUrl + '" target="_blank">' + externalUrl + '</a>').show().trigger('create');
+            $('.externalUrl', page).html('Remote access: <a href="' + externalUrl + '" target="_blank">' + externalUrl + '</a>').show().trigger('create');
         } else {
             $('.externalUrl', page).hide();
         }
diff --git a/dashboard-ui/scripts/dashboardpage.js b/dashboard-ui/scripts/dashboardpage.js
index 39b007046f..a3aaf56d44 100644
--- a/dashboard-ui/scripts/dashboardpage.js
+++ b/dashboard-ui/scripts/dashboardpage.js
@@ -417,14 +417,29 @@
             $('.btnRestartContainer', page).addClass('hide');
         }
 
-        DashboardPage.renderApplicationUpdateInfo(dashboardInfo);
-        DashboardPage.renderPluginUpdateInfo(dashboardInfo);
-        DashboardPage.renderPendingInstallations(dashboardInfo.SystemInfo);
+        DashboardPage.renderUrls(page, dashboardInfo.SystemInfo);
+        DashboardPage.renderApplicationUpdateInfo(page, dashboardInfo);
+        DashboardPage.renderPluginUpdateInfo(page, dashboardInfo);
+        DashboardPage.renderPendingInstallations(page, dashboardInfo.SystemInfo);
+    },
+    
+    renderUrls: function (page, systemInfo) {
+        
+        var url = ApiClient.serverAddress() + "/mediabrowser";
+
+        $('#bookmarkUrl', page).html(url).attr("href", url);
+
+        if (systemInfo.WanAddress) {
+
+            var externalUrl = systemInfo.WanAddress + "/mediabrowser";
+
+            $('.externalUrl', page).html('Remote access: <a href="' + externalUrl + '" target="_blank">' + externalUrl + '</a>').show().trigger('create');
+        } else {
+            $('.externalUrl', page).hide();
+        }
     },
 
-    renderApplicationUpdateInfo: function (dashboardInfo) {
-
-        var page = $.mobile.activePage;
+    renderApplicationUpdateInfo: function (page, dashboardInfo) {
 
         $('#updateFail', page).hide();
 
@@ -478,9 +493,7 @@
         }
     },
 
-    renderPendingInstallations: function (systemInfo) {
-
-        var page = $.mobile.activePage;
+    renderPendingInstallations: function (page, systemInfo) {
 
         if (systemInfo.CompletedInstallations.length) {
 
@@ -504,7 +517,7 @@
         $('#pendingInstallations', page).html(html);
     },
 
-    renderPluginUpdateInfo: function (dashboardInfo) {
+    renderPluginUpdateInfo: function (page, dashboardInfo) {
 
         // Only check once every 10 mins
         if (DashboardPage.lastPluginUpdateCheck && (new Date().getTime() - DashboardPage.lastPluginUpdateCheck) < 600000) {
@@ -513,8 +526,6 @@
 
         DashboardPage.lastPluginUpdateCheck = new Date().getTime();
 
-        var page = $.mobile.activePage;
-
         ApiClient.getAvailablePluginUpdates().done(function (updates) {
 
             var elem = $('#pPluginUpdates', page);
diff --git a/dashboard-ui/scripts/livetvstatus.js b/dashboard-ui/scripts/livetvstatus.js
index cd98be2442..e68ca9e66e 100644
--- a/dashboard-ui/scripts/livetvstatus.js
+++ b/dashboard-ui/scripts/livetvstatus.js
@@ -120,7 +120,7 @@
             versionHtml += ' <a style="margin-left: .25em;" href="' + serviceUrl + '" target="_blank">(Update available)</a>';
         }
         else {
-            versionHtml += '<img src="css/images/checkmarkgreen.png" style="height: 17px; margin-left: 10px; margin-right: 0; position: relative; top: 4px;" /> Up to date!';
+            versionHtml += '<img src="css/images/checkmarkgreen.png" style="height: 17px; margin-left: 10px; margin-right: 0; position: relative; top: 5px; border-radius:3px;" /> Up to date!';
         }
 
         $('#activeServiceVersion', page).html(versionHtml);
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 8de70382df..07296f29dc 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -711,7 +711,7 @@ var Dashboard = {
         return [{
             name: "Dashboard",
             href: "dashboard.html",
-            selected: pageElem.id == "dashboardPage"
+            selected: page.hasClass("dashboardHomePage")
         }, {
             name: "Media Library",
             divider: true,
