diff --git a/public/modules/core/views/header.client.view.html b/public/modules/core/views/header.client.view.html
index 9c93c6e7..bdea4056 100644
--- a/public/modules/core/views/header.client.view.html
+++ b/public/modules/core/views/header.client.view.html
@@ -10,8 +10,18 @@
 	</div>
 	<nav class="collapse navbar-collapse" collapse="!isCollapsed" role="navigation">
 		<ul class="nav navbar-nav" data-ng-if="menu.shouldRender(authentication.user);">
-			<li data-ng-repeat="item in menu.items" data-ng-if="item.shouldRender(authentication.user);" ui-route="{{item.uiRoute}}" ng-class="{active: $uiRoute}">
-				<a href="/#!/{{item.link}}">{{item.title}}</a>
+			<li data-ng-repeat="item in menu.items" data-ng-if="item.shouldRender(authentication.user);" ng-switch="item.class" class="{{item.class}}" ui-route="{{item.uiRoute}}" ng-class="{active: $uiRoute}">
+				<a ng-switch-when="dropdown" href="#" class="dropdown-toggle" data-toggle="dropdown">
+		                    {{item.title}}
+		                    <b class="caret"></b>
+		                </a>
+		                <ul ng-switch-when="dropdown" class="dropdown-menu"> 
+		                    <li data-ng-repeat="subitem in item.subitems">
+		                        <a href="/#!/{{subitem.link}}">{{subitem.title}}</a>
+		                    </li>                
+		                </ul>
+		                
+		                <a ng-switch-default href="/#!/{{item.link}}">{{item.title}}</a>
 			</li>
 		</ul>
 		<ul class="nav navbar-nav navbar-right" data-ng-hide="authentication.user">
@@ -46,4 +56,4 @@
 			</li>
 		</ul>
 	</nav>
-</div>
\ No newline at end of file
+</div>