diff --git a/include/nav.php b/include/nav.php
index 8428b6b0fd..8f82bc4d02 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -118,15 +118,17 @@ function nav_info(&$a) {
 	if(count($a->apps)>0)
 		$nav['apps'] = array('apps', t('Apps'), "", t('Addon applications, utilities, games'));
 
-	$nav['search'] = array('search', t('Search'), "", t('Search site content'));
+	if (local_user() OR !get_config('system','local_search')) {
+		$nav['search'] = array('search', t('Search'), "", t('Search site content'));
 
-	$nav['searchoption'] = array(
-					t("Full Text"),
-					t("Tags"),
-					t("Contacts"));
+		$nav['searchoption'] = array(
+						t("Full Text"),
+						t("Tags"),
+						t("Contacts"));
 
-	if (get_config('system','poco_local_search'))
-		$nav['searchoption'][] = t("Forums");
+		if (get_config('system','poco_local_search'))
+			$nav['searchoption'][] = t("Forums");
+	}
 
 	$gdirpath = 'directory';
 
@@ -140,7 +142,8 @@ function nav_info(&$a) {
 	elseif(get_config('system','community_page_style') == CP_GLOBAL_COMMUNITY)
 		$nav['community'] = array('community', t('Community'), "", t('Conversations on the network'));
 
-	$nav['events'] = Array('events', t('Events'), "", t('Events and Calendar'));
+	if(local_user())
+		$nav['events'] = Array('events', t('Events'), "", t('Events and Calendar'));
 
 	$nav['directory'] = array($gdirpath, t('Directory'), "", t('People directory'));
 
diff --git a/view/theme/vier/mobile.css b/view/theme/vier/mobile.css
index 469146ad41..a1ed516eb7 100644
--- a/view/theme/vier/mobile.css
+++ b/view/theme/vier/mobile.css
@@ -63,6 +63,34 @@ nav ul {
   a.desktop-view { display: none; }
   a.mobile-view { display: initial; }
   #nav-apps-link { display: none; }
+
+  .wall-item-container .wall-item-info { width: auto; }
+  .contact-photo-wrapper { width: 55px; }
+  .wwto { left: 0px; }
+
+  .type-link > a { height: 120px; width: 100%; overflow: hidden; display: block; }
+  .type-link > a > img { display: block; max-width: 100%!important; width: 100% !important; height: 100% !important; object-fit: cover !important; }
+
+    /** oembed **/
+  .embed_video {
+    float: none;
+    margin: 0px;
+    width: 100%;
+    overflow: hidden;
+    display: block;
+  }
+  .embed_video > img {
+    display: block;
+    width: 100% !important;
+    height: 100% !important;
+    max-width: 100% !important;
+    object-fit: cover !important;
+  }
+  .embed_video > div {
+    background-image: none !important; background-color: transparent !important;
+    width: 100% !important; height: 110px !important;
+  }
+
 }
 
 @media screen and (max-width: 480px) {
@@ -105,10 +133,6 @@ nav ul {
   max-width: 100%;
 }
 
-.wall-item-container .wall-item-info { width: auto; }
-.contact-photo-wrapper { width: 55px; }
-.wwto { left: 0px; }
-
 /* aside in/out */
 .mobile-aside-toggle {
 	display: block !important;
@@ -256,25 +280,4 @@ select:focus {
 .event-start, .event-end { width: auto; }
 .event-start .dtstart, .event-end .dtend { float: none; display: block; }
 
-/** oembed **/
-.embed_video {
-  float: none;
-  margin: 0px;
-  height: 120px;
-  width: 100%;
-  overflow: hidden;
-  display: block;
-}
-.embed_video > img {
-  display: block;
-  width: 100% !important;
-  height: auto !important;
-  max-width: 100% !important;
-}
-.embed_video > div {
-  background-image: none !important; background-color: transparent !important;
-  width: 100% !important; height: 110px !important;
-}
 
-.type-link > a { height: 120px; width: 100%; overflow: hidden; display: block; }
-.type-link > a > img { display: block; max-width: 100%!important; width: 100% !important; height: auto !important; }
diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css
index 564669b19b..ebe8a895b4 100644
--- a/view/theme/vier/style.css
+++ b/view/theme/vier/style.css
@@ -2378,6 +2378,11 @@ ul.tabs li .active, span.pager_current a {
 aside form {
   overflow-x: hidden;
 }
+aside form fieldset {
+  margin: 0px;
+  padding: 0px;
+  border: 0px none;
+}
 aside form .field label {
   float: left;
   width: 170px;