diff --git a/include/event.php b/include/event.php
index c4111dc0b..13c414c9e 100644
--- a/include/event.php
+++ b/include/event.php
@@ -61,7 +61,7 @@ function format_event_html($ev, $simple = false) {
 			. bbcode($ev['location'])
 			. '</span></p>' . "\r\n";
 
-		if (strpos($ev['location'], "[map")===False) {
+		if (strpos($ev['location'], "[map") !== False) {
 			$map = generate_named_map($ev['location']);
 			if ($map!==$ev['location']) $o.=$map;
 		}
diff --git a/include/text.php b/include/text.php
index 62d4bf151..4f3af5aee 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1504,7 +1504,7 @@ function prepare_body(&$item,$attach = false, $preview = false) {
 
 		$pos = strpos($s, $spoilersearch);
 		$rnd = random_string(8);
-		$spoilerreplace = '<br /> <span id="spoiler-wrap-'.$rnd.'" style="white-space:nowrap;" class="fakelink" onclick="openClose(\'spoiler-'.$rnd.'\');">'.sprintf(t('Click to open/close')).'</span>'.
+		$spoilerreplace = '<br /> <span id="spoiler-wrap-'.$rnd.'" class="spoiler-wrap fakelink" onclick="openClose(\'spoiler-'.$rnd.'\');">'.sprintf(t('Click to open/close')).'</span>'.
 					'<blockquote class="spoiler" id="spoiler-'.$rnd.'" style="display: none;">';
 		$s = substr($s, 0, $pos).$spoilerreplace.substr($s, $pos+strlen($spoilersearch));
 	}
@@ -1516,7 +1516,7 @@ function prepare_body(&$item,$attach = false, $preview = false) {
 
 		$pos = strpos($s, $authorsearch);
 		$rnd = random_string(8);
-		$authorreplace = '<br /> <span id="author-wrap-'.$rnd.'" style="white-space:nowrap;" class="fakelink" onclick="openClose(\'author-'.$rnd.'\');">'.sprintf(t('Click to open/close')).'</span>'.
+		$authorreplace = '<br /> <span id="author-wrap-'.$rnd.'" class="author-wrap fakelink" onclick="openClose(\'author-'.$rnd.'\');">'.sprintf(t('Click to open/close')).'</span>'.
 					'<blockquote class="author" id="author-'.$rnd.'" style="display: block;">';
 		$s = substr($s, 0, $pos).$authorreplace.substr($s, $pos+strlen($authorsearch));
 	}
diff --git a/mod/display.php b/mod/display.php
index ca57af923..4e3392707 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -192,13 +192,20 @@ function display_fetchauthor($a, $item) {
 			$profiledata["photo"] = $r[0]["photo"];
 			$profiledata["nickname"] = $r[0]["nick"];
 			$profiledata["addr"] = $r[0]["addr"];
-			$profiledata["keywords"] = $r[0]["keywords"];
 			$profiledata["network"] = $r[0]["network"];
 
+			if ($r[0]["keywords"])
+				$profiledata["keywords"] = $r[0]["keywords"];
+
 			if ($showdetails) {
-				$profiledata["address"] = $r[0]["location"];
-				$profiledata["about"] = $r[0]["about"];
-				$profiledata["gender"] = $r[0]["gender"];
+				if ($r[0]["location"])
+					$profiledata["address"] = $r[0]["location"];
+
+				if ($r[0]["about"])
+					$profiledata["about"] = $r[0]["about"];
+
+				if ($r[0]["gender"])
+					$profiledata["gender"] = $r[0]["gender"];
 			}
 		}
 	}
diff --git a/view/theme/vier/mobile.css b/view/theme/vier/mobile.css
index cde49b7b7..f6ec2b8cc 100644
--- a/view/theme/vier/mobile.css
+++ b/view/theme/vier/mobile.css
@@ -67,10 +67,23 @@ nav ul {
 
 @media screen and (max-width: 480px) {
   .wall-item-container .wall-item-content img,
-  .children .wall-item-container .wall-item-item .wall-item-content img,
   .wall-item-container .wall-item-content .type-link img.attachment-image, .type-link img.attachment-image, .type-video img.attachment-image {
     max-width: 200px;
   }
+  /* fix img width in threaded view - maybe there exists a better possibility to do this 
+    maybe this needs also to be done for tablet view*/
+  .children .wall-item-container .wall-item-item .wall-item-content img {
+    max-width: 100%;
+  }
+  iframe {
+    max-width: 100%;
+  }
+
+  /* the top-nav notfication menu
+    Note: the device needs a min display width of 320px */
+  #nav-notifications-menu {
+    width: 270px;
+  }
 }
 
 .wall-item-container.thread_level_2,
diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css
index defeec702..16685e55e 100644
--- a/view/theme/vier/style.css
+++ b/view/theme/vier/style.css
@@ -1783,7 +1783,8 @@ section.minimal {
 }
 
 #jot-preview-content {
-  padding-top: 25px;
+  padding-top: 4px;
+  clear: both;
 }
 
 #jot-preview-content .tread-wrapper {