diff --git a/app/views/layouts/application-ng.rhtml b/app/views/layouts/application-ng.rhtml
index fff6664..694023a 100644
--- a/app/views/layouts/application-ng.rhtml
+++ b/app/views/layouts/application-ng.rhtml
@@ -93,10 +93,6 @@
         </h1>
         <div id="navigation">
           <ul>
-            <li><%= link_to '<span class="icon-menu-people">' + _('People') + '</span>',
-                            '/assets/people', :id=>'people'           %></li>
-            <li><%= link_to '<span class="icon-menu-community">' + _('Communities') + '</span>',
-                            '/assets/communities', :id=>'communities' %></li>
             <%= theme_extra_navigation %>
           </ul>
           <div id="navigation-end"></div>
diff --git a/public/designs/themes/base/navigation.rhtml b/public/designs/themes/base/navigation.rhtml
index 8978b1a..5946359 100644
--- a/public/designs/themes/base/navigation.rhtml
+++ b/public/designs/themes/base/navigation.rhtml
@@ -1,3 +1,5 @@
+<li><a href="/assets/people"><span class='icon-menu-people'><%= _('People') %></span></a></li>
+<li><a href="/assets/communities"><span class='icon-menu-community'><%= _('Communities') %></span></a></li>
 <li><a href="/assets/enterprises"><span class='icon-menu-enterprise'><%= _('Enterprises') %></span></a></li>
 <li><a href="/assets/products"><span class='icon-menu-product'><%= _('Products') %></span></a></li>
 <li><a href="/assets/events"><span class='icon-menu-events'><%= _('Events') %></span></a></li>
--
libgit2 0.21.2