diff --git a/include/nav.php b/include/nav.php
index 4e3d9fbec..ab0eaa855 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -134,7 +134,7 @@ EOT;
 	if(($a->config['system']['register_policy'] == REGISTER_OPEN) && (! local_user()) && (! remote_user()))
 		$nav['register'] = array('register',t('Register'), "", t('Create an account'));
 
-	$help_url = z_root() . '/help';
+	$help_url = z_root() . '/help?f=&cmd=' . $a->cmd;
 
 	if(! get_config('system','hide_help'))
 		$nav['help'] = array($help_url, t('Help'), "", t('Help and documentation'));
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index da02f86f3..ec9731fef 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -163,7 +163,7 @@
 
 			{{if $nav.help}}
 				<li class="{{$sel.help}}">
-					<a class="{{$nav.help.2}}" target="friendika-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" ><i class="icon-question"></i></a>
+					<a class="{{$nav.help.2}}" target="redmatrix-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" ><i class="icon-question"></i></a>
 				</li>
 			{{/if}}
 			</ul>
@@ -171,6 +171,3 @@
 	</div>
 
 
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li class="{5}"><a href="{0}" title="{2} {3}"><img src="{1}"><span class='contactname'>{2}</span>{3}<br><span class="notif-when">{4}</span></a></li>
-</ul>