diff --git a/include/bbcode.php b/include/bbcode.php
index 8ef144ea0..6cce25bcf 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -812,7 +812,10 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
 		$Text = preg_replace("/([@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
 			'$1<span class="vcard"><a href="$2" class="url" title="$3"><span class="fn nickname mention">$3</span></a></span>',
 			$Text);
-
+	elseif (!$simplehtml)
+		$Text = preg_replace("/([@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
+			'$1<a href="$2" class="userinfo mention" title="$3">$3</a>',
+			$Text);
 
 	// Bookmarks in red - will be converted to bookmarks in friendica
 	$Text = preg_replace("/#\^\[url\]([$URLSearchString]*)\[\/url\]/ism", '[bookmark=$1]$1[/bookmark]', $Text);
@@ -854,6 +857,9 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
 	if ($tryoembed)
 		$Text = preg_replace_callback("/\[url\]([$URLSearchString]*)\[\/url\]/ism",'tryoembed',$Text);
 
+	$Text = preg_replace("/([#])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
+				'$1<a href="$2" class="tag" title="$3">$3</a>', $Text);
+
 	$Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/ism", '<a href="$1" target="_blank">$1</a>', $Text);
 	$Text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '<a href="$1" target="_blank">$2</a>', $Text);
 	//$Text = preg_replace("/\[url\=([$URLSearchString]*)\]([$URLSearchString]*)\[\/url\]/ism", '<a href="$1" target="_blank">$2</a>', $Text);
diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index 4d7e4e2cb..a874ce6ae 100644
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -1255,7 +1255,11 @@ section #jotOpen {
     max-height: 480px;
     object-fit: contain;
 }
-.shared-content-wrapper,
+.wall-item-body > img,
+.wall-item-body > a > img {
+    border-radius: 3px;
+}
+.shared-wrapper,
 .vevent {
     margin-left: 50px;
     margin-right: 50px;
@@ -1263,13 +1267,13 @@ section #jotOpen {
     box-shadow: 0 0 0 1.5px rgba(0, 0, 0, .1) inset, 0 1px 1px rgba(0, 0, 0, .05);
 }
 @media screen and (max-width: 767px) {
-    .shared-content-wrapper,
+    .shared-wrapper,
     .vevent {
 	margin-left: 0px;
 	margin-right: 0px;
     }
 }
-.shared-content-wrapper:hover,
+.shared-wrapper:hover,
 .vevent:hover {
     box-shadow: 0 0 0 1.5px rgba(0, 0, 0, .15) inset, 0 1px 1px rgba(0, 0, 0, .05);
 }
diff --git a/view/theme/frio/js/theme.js b/view/theme/frio/js/theme.js
index 928b04551..5138a4822 100644
--- a/view/theme/frio/js/theme.js
+++ b/view/theme/frio/js/theme.js
@@ -68,24 +68,8 @@ $(document).ready(function(){
 		if( $("#jot-popup").is(":hidden")) $("#topbar-second > .container > #navbar-button #jotOpen").hide();
 	}
 
-	// move shared content in it's own DIV (so we can style it better)
-	$('.wall-item-body .shared_content').each(function() {
-		// create a DIV after ".shared_content" where we will putt in the shared_header
-		// and the "shared_content"
-		$(this).after('<div class="shared-content-wrapper content-card"></div>');
-		// get the shared_header
-		var sheader = $(this).prev();
-		// get the shared-content-wrapper which we have created above
-		var swrapper = $(this).next();
-		// move the "shared_header into the new shared_content DIV
-		$(swrapper).append(sheader);
-		// move the "shared_content" into the new DIV
-		$(swrapper).append(this);
-	});
-
-
 	// show bulk deletion button at network page if checkbox is checked
-	$('input.item-select').change(function(){
+	$("body").change("input.item-select", function(){
 		var checked = false;
 
 		// We need to get all checked items, so it would close the delete button