diff --git a/view/theme/diabook/icons/link.png b/view/theme/diabook/icons/link.png
new file mode 100755
index 000000000..0ef666a67
Binary files /dev/null and b/view/theme/diabook/icons/link.png differ
diff --git a/view/theme/diabook/icons/lock.png b/view/theme/diabook/icons/lock.png
new file mode 100755
index 000000000..e00c5b2a2
Binary files /dev/null and b/view/theme/diabook/icons/lock.png differ
diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl
index 80240f4ae..17df8e652 100644
--- a/view/theme/diabook/nav.tpl
+++ b/view/theme/diabook/nav.tpl
@@ -1,5 +1,5 @@
 <header>
-	{# $langselector #}
+	{# $langselector version 0.01#}
 
 	<div id="site-location">$sitelocation</div>
 	<div id="banner">$banner</div>
@@ -18,7 +18,7 @@
 			</li>
 		    {{ endif }}
 	
-
+			{{ if $nav.contacts }}
 			<li class="nav-menu-icon" id="nav-contacts-linkmenu">
 				<a href="$nav.contacts.0" rel="#nav-contacts-menu" title="$nav.contacts.1">
 				<span class="icon contacts">$nav.contacts.1</span></a>
@@ -28,9 +28,9 @@
 					<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li> 
 				</ul>
 			</li>	
+			{{ endif }}
 			
-			
-			
+			{{ if $nav.messages }}
 			<li  id="nav-messages-linkmenu" class="nav-menu-icon">
 			  <a href="$nav.messages.0" rel="#nav-messages-menu" title="$nav.messages.1">
 			  <span class="icon messages">$nav.messages.1</span></a>
@@ -42,9 +42,8 @@
 					<li id="nav-messages-new"><a href="message/new">Neue Nachricht</a></li>
 				</ul>
 			</li>		
+			{{ endif }}
 		
-		
-      
       {{ if $nav.notifications }}
 			<li  id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1"><span class="icon notify">$nav.notifications.1</span></a>
 				<span id="notify-update" class="nav-notify"></span>
@@ -54,9 +53,7 @@
 					<li class="empty">$emptynotifications</li>
 				</ul>
 			</li>		
-		{{ endif }}			
-		
-				
+		{{ endif }}					
 		
 		<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
 			<ul id="nav-site-menu" class="menu-popup">
@@ -70,16 +67,17 @@
 				{{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }}
 
 				{{ if $nav.logout }}<li><a class="menu-sep $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>{{ endif }}
-				{{ if $nav.login }}<li><a class="$nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a><li>{{ endif }}
+
 				
 			</ul>		
 		</li>
 		
 		
-
+		{{ if $nav.directory }}
 		<li id="nav-directory-link" class="nav-menu $sel.directory">
 			<a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
 		</li>
+		{{ endif }}
 		
 		{{ if $nav.apps }}
 			<li id="nav-apps-link" class="nav-menu $sel.apps">
@@ -113,14 +111,22 @@
 			</li>
 		{{ endif }}
 		
+					{{ if $nav.login }}
+					<li id="nav-home-link" class="nav-menu $sel.home">
+						<a class="$nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a>
+					<li>
+					{{ endif }}
 		
 		
-	</ul>
-	</div>	
+		
+	</ul>	
 
 </nav>
+
+
+
 <ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
+	<li class="{4}"><a href="{0}"><img src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
 </ul>
 
 {#
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index 383fba24d..c98a8fa91 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -102,6 +102,8 @@
 .icon.tagged    { background-image: url("../../../view/theme/diabook/icons/tagged.png");}
 .icon.unstarred    { background-image: url("../../../view/theme/diabook/icons/unstarred.png");}
 .icon.star    { background-image: url("../../../view/theme/diabook/icons/star.png");}
+.icon.link		{ background-image: url("../../../view/theme/diabook/icons/link.png");}
+.icon.lock		{ background-image: url("../../../view/theme/diabook/icons/lock.png");}
 
 .article	{ background-position: -50px  0px;}
 .audio 		{ background-position: -70px  0px;}
@@ -112,7 +114,7 @@
 .camera 	{ background-position: -170px 0px;}
 /*.dislike 	{ background-position: -190px 0px;}*/
 /*.like 		{ background-position: -210px 0px;}*/
-.link 		{ background-position: -230px 0px;}
+/*.link 		{ background-position: -230px 0px;}*/
 
 .globe 		{ background-position: -50px  -20px;}
 .noglobe 	{ background-position: -70px  -20px;}
@@ -126,7 +128,7 @@
 .share 		{ background-position: -230px -20px;}
 
 .tools 		{ background-position: -50px  -40px;}
-.lock 		{ background-position: -70px  -40px;}
+/*.lock 		{ background-position: -70px  -40px;}*/
 
 .video          { background-position: -110px -40px;}
 .youtube        { background-position: -130px -40px;}
@@ -160,7 +162,7 @@
   display: block;
   width: 20px;
   height: 20px;
-  background-image: url('icons.png');
+  /*background-image: url('icons.png');*/
 }
 
 .icon {
@@ -613,7 +615,7 @@ nav .nav-notify {
   border-radius: 5px 5px 5px 5px;
   font-size: 10px;
   font-weight: 900;
-  padding: 1px 3px;
+  padding: 1px 4px;
   top: 0px;
   right: -6px;
   min-width: 10px;
@@ -673,6 +675,10 @@ nav #nav-apps-link.selected {
 	padding: 5px 10px; */
 }
 
+.notify-seen {
+	background: none repeat scroll 0 0 #DDDDDD;
+	}
+
 ul.menu-popup {
   position: absolute;
   display: none;
@@ -1162,15 +1168,15 @@ section {
   padding-bottom: 2px;
 }
 .tag {
-  background: url("../../../images/tag_b.png") repeat-x center left;
-  color: #ffffff;
+  /*background: url("../../../images/tag_b.png") repeat-x center left;*/
+  color: #3465A4;
   padding-left: 3px;
-  font-size: 10px;
+  font-size: 12px;
 }
 .tag a {
-  padding-right: 8px;
-  background: url("../../../images/tag.png") no-repeat center right;
-  color: #ffffff;
+  padding-right: 5px;
+  /*background: url("../../../images/tag.png") no-repeat center right;*/
+  color: #3465A4;
 }
 .wwto {
   position: absolute !important;
diff --git a/view/theme/diabook/wall_item.tpl b/view/theme/diabook/wall_item.tpl
index 1f1a878b4..10d395316 100644
--- a/view/theme/diabook/wall_item.tpl
+++ b/view/theme/diabook/wall_item.tpl
@@ -5,6 +5,9 @@
 	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
 </div>
 {{ endif }}
+
+
+
 <div class="wall-item-container $item.indent">
 	<div class="wall-item-item">
 		<div class="wall-item-info">
@@ -36,26 +39,21 @@
 	</div>
 	<div class="wall-item-bottom">
 		<div class="wall-item-links">
+			{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
 		</div>
 		<div class="wall-item-tags">
-			{{ for $item.tags as $item.tag }}
-				<span class='tag'>$item.tag</span>
+			{{ for $item.tags as $tag }}
+				<span class='tag'>$tag</span>
 			{{ endfor }}
 		</div>
 	</div>
 	<div class="wall-item-bottom">
 		<div class="">
-			{{ if $item.plink }}<a class="icon s16 link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
+
 		</div>
 		<div class="wall-item-actions">
 			<div class="wall-item-location">$item.location&nbsp;</div>
 			<div class="wall-item-actions-social">
-		
-		{{ if $item.star }}
-				<a href="#" id="star-$item.id" class="icon unstarred" onclick="dostar($item.id); return false;"  class="$item.star.classdo" title="$item.star.do">$item.star.do</a>
-				<a href="#" id="unstar-$item.id" class="icon star" onclick="dostar($item.id); return false;"  class="$item.star.classundo"  title="$item.star.undo">$item.star.undo</a>
-				<a href="#" id="tagger-$item.id" class="icon tagged" onclick="itemTag($item.id); return false;" class="$item.star.classtagger" title="$item.star.tagger">$item.star.tagger</a>
-			{{ endif }}
 				
 			{{ if $item.vote }}
 				<a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
@@ -64,7 +62,14 @@
 						
 			{{ if $item.vote.share }}
 				<a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>
-			{{ endif }}				
+			{{ endif }}		
+			
+			{{ if $item.star }}
+				<a href="#" id="star-$item.id" class="icon star" onclick="dostar($item.id); return false;"  class="$item.star.classdo" title="$item.star.do">$item.star.do</a>
+				<a href="#" id="unstar-$item.id" class="icon unstarred" onclick="dostar($item.id); return false;"  class="$item.star.classundo"  title="$item.star.undo">$item.star.undo</a>
+				<a href="#" id="tagger-$item.id" class="icon tagged" onclick="itemTag($item.id); return false;" class="$item.star.classtagger" title="$item.star.tagger">$item.star.tagger</a>
+			{{ endif }}			
+					
 			</div>
 			
 			<div class="wall-item-actions-tools">