Index: branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/Index.cshtml
===================================================================
--- branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/Index.cshtml	(revision 13860)
+++ branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/Index.cshtml	(revision 13862)
@@ -8,5 +8,5 @@
 <div class="animated fadeIn">
     <!-- Main nav menu-->
-    @Html.Partial("Navbar", new NavbarViewModel("Job", Model.currentUser))
+    @Html.Partial("Navbar", new NavbarViewModel("Job", Model.User))
 
     <!-- Job menu-->
Index: branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/OpenFile.cshtml
===================================================================
--- branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/OpenFile.cshtml	(revision 13860)
+++ branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/OpenFile.cshtml	(revision 13862)
@@ -14,5 +14,5 @@
     <div id="userId" style="display:none">@ViewBag.SessionId</div>
     <!-- Main nav menu -->
-    @Html.Partial("Navbar", new HeuristicLab.Clients.Hive.WebJobManager.ViewModels.NavbarViewModel("Job", Model.currentUser))
+    @Html.Partial("Navbar", new HeuristicLab.Clients.Hive.WebJobManager.ViewModels.NavbarViewModel("Job", Model.User))
 
     <!-- Job menu-->
Index: branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/UploaderPartial/_UploaderPartial.cshtml
===================================================================
--- branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/UploaderPartial/_UploaderPartial.cshtml	(revision 13860)
+++ branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/UploaderPartial/_UploaderPartial.cshtml	(revision 13862)
@@ -48,5 +48,5 @@
                     <span class="input-group-addon"
                           id="basic-addon3">
-                        .../uploads/@(Model.currentUser.currentUser.UserName != null ?  Model.currentUser.currentUser.UserName : Model.currentUser.currentUser.FullName)/
+                        .../uploads/@(Model.User.currentUser.UserName != null ?  Model.User.currentUser.UserName : Model.User.currentUser.FullName)/
                     </span>
                     <input type="text"
Index: branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/Uploads.cshtml
===================================================================
--- branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/Uploads.cshtml	(revision 13860)
+++ branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/Uploads.cshtml	(revision 13862)
@@ -5,5 +5,5 @@
 <div class="animated fadeIn">
 
-    @Html.Partial("Navbar", new HeuristicLab.Clients.Hive.WebJobManager.ViewModels.NavbarViewModel("Job", Model.currentUser))
+    @Html.Partial("Navbar", new HeuristicLab.Clients.Hive.WebJobManager.ViewModels.NavbarViewModel("Job", Model.User))
 
     <ul class="nav nav-pills nav-justified">
Index: branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/OkbManagement/Index.cshtml
===================================================================
--- branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/OkbManagement/Index.cshtml	(revision 13862)
+++ branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/OkbManagement/Index.cshtml	(revision 13862)
@@ -0,0 +1,59 @@
+﻿@using HeuristicLab.Clients.Hive.WebJobManager.ViewModels;
+@using Newtonsoft.Json;
+@model OkbManagementVM
+<div id="userId" style="display:none">@ViewBag.SessionId</div>
+<script src="~/js/hubs/okbmanagerhubber.js"></script>
+<div ng-app="wjmokbmanager" ng-controller="okbmanangerCtrl" id="controllerdiv" class="animated fadeIn">
+
+
+    @Html.Partial("Navbar", new NavbarViewModel("OKBAdmin", Model.User))
+
+    @Html.Partial("_ErrorMessage", Model.message)
+
+    <ul class="nav nav-pills nav-justified">
+
+        <li role="presentation"
+            ng-class="{active: currentData.name === 'Platforms'}">
+                <a ng-click="selectDataCat('platforms')" href="">
+                    Platforms
+                </a>
+        </li>
+        <li role="presentation"
+            ng-class="{active: currentData.name === 'Algorithm classes'}">
+            <a ng-click="selectDataCat('algoclass')" href="">
+                Algorithm classes
+            </a>
+        </li>
+        <li role="presentation"
+            ng-class="{active: currentData.name === 'Algorithms'}">
+            <a ng-click="selectDataCat('algos')" href="">
+                Algorithms
+            </a>
+        </li>
+        <li role="presentation"
+            ng-class="{active: currentData.name === 'Problem classes'}">
+            <a ng-click="selectDataCat('probclass')" href="">
+                Problem classes
+            </a>
+        </li>
+        <li role="presentation"
+            ng-class="{active: currentData.name === 'Problems'}">
+            <a ng-click="selectDataCat('problems')" href="">
+                PlatformsProblems
+            </a>
+        </li>
+
+    </ul>
+
+    <script type="text/javascript">
+        window.onload = function (){
+            var vm = angular.element(document.getElementById('controllerdiv')).scope();
+            console.log(vm);
+            vm.initData(@Html.Raw(JsonConvert.SerializeObject(Model.client.Platforms)), "platforms");
+            vm.initData(@Html.Raw(JsonConvert.SerializeObject(Model.client.AlgorithmClasses)), "algoclass");
+            vm.initData(@Html.Raw(JsonConvert.SerializeObject(Model.client.ProblemClasses)), "probclass");
+            vm.initData(@Html.Raw(JsonConvert.SerializeObject(Model.client.Algorithms)), "algos");
+            vm.initData(@Html.Raw(JsonConvert.SerializeObject(Model.client.Problems)), "problems");
+        }
+    </script>
+</div>
Index: branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Shared/Navbar.cshtml
===================================================================
--- branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Shared/Navbar.cshtml	(revision 13860)
+++ branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Shared/Navbar.cshtml	(revision 13862)
@@ -77,4 +77,22 @@
     </li>
     <li role="presentation"
+        class="@(Model.Active == "OKBAdmin" ? "active" : "")
+        @(Model.User.hasOKBAdminAccess() == false ? "disabled" : "")
+        ">
+        @if ( Model.User.hasOKBAdminAccess())
+            {
+            <a asp-controller="OkbManagement"
+               asp-action="Index"
+               accesskey="q">
+                OKB management
+            </a>
+        }
+        else
+        {
+            <a>OKB management</a>
+        }
+
+    </li>
+    <li role="presentation"
         class="pull-right ">
         
Index: branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/User/Groups.cshtml
===================================================================
--- branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/User/Groups.cshtml	(revision 13860)
+++ branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/User/Groups.cshtml	(revision 13862)
@@ -5,5 +5,5 @@
 <div class="animated fadeIn">
 
-    @Html.Partial("Navbar", new HeuristicLab.Clients.Hive.WebJobManager.ViewModels.NavbarViewModel("User", Model.currentUser))
+    @Html.Partial("Navbar", new HeuristicLab.Clients.Hive.WebJobManager.ViewModels.NavbarViewModel("User", Model.User))
 
     <ul class="nav nav-pills nav-justified">
Index: branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/User/Index.cshtml
===================================================================
--- branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/User/Index.cshtml	(revision 13860)
+++ branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/User/Index.cshtml	(revision 13862)
@@ -4,5 +4,5 @@
 <div class="animated fadeIn">
 
-    @Html.Partial("Navbar", new HeuristicLab.Clients.Hive.WebJobManager.ViewModels.NavbarViewModel("User", Model.currentUser))
+    @Html.Partial("Navbar", new HeuristicLab.Clients.Hive.WebJobManager.ViewModels.NavbarViewModel("User", Model.User))
 
     <ul class="nav nav-pills nav-justified">
Index: branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/User/Roles.cshtml
===================================================================
--- branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/User/Roles.cshtml	(revision 13860)
+++ branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/User/Roles.cshtml	(revision 13862)
@@ -5,5 +5,5 @@
 <div class="animated fadeIn">
 
-    @Html.Partial("Navbar", new HeuristicLab.Clients.Hive.WebJobManager.ViewModels.NavbarViewModel("User", Model.currentUser))
+    @Html.Partial("Navbar", new HeuristicLab.Clients.Hive.WebJobManager.ViewModels.NavbarViewModel("User", Model.User))
 
     <ul class="nav nav-pills nav-justified">
