diff --git a/luciexpress/htdocs/plugins/core/css/checkbox.css b/luciexpress/htdocs/plugins/core/css/checkbox.css
index 0f8edbfe5..913a48042 100644
--- a/luciexpress/htdocs/plugins/core/css/checkbox.css
+++ b/luciexpress/htdocs/plugins/core/css/checkbox.css
@@ -1,14 +1,14 @@
 .checkbox-info input[type="checkbox"] {
-    cursor: pointer; 
+	cursor: pointer; 
 }
 .checkbox-info input[type="checkbox"]:checked + label::before {
-    background-color: #64bd63;
-    border-color: #808080;
+	background-color: #64bd63;
+	border-color: #808080;
 }
 .checkbox-info input[type="checkbox"]:checked + label::after {
-    color: #fff;
+	color: #fff;
 }
 .checkbox-small {
-    margin-top: 0px !important;
-    margin-bottom: 0px !important;
+	margin-top: 0px !important;
+	margin-bottom: 0px !important;
 }
diff --git a/luciexpress/htdocs/plugins/core/css/menu.css b/luciexpress/htdocs/plugins/core/css/menu.css
index 0db98952d..199d64792 100644
--- a/luciexpress/htdocs/plugins/core/css/menu.css
+++ b/luciexpress/htdocs/plugins/core/css/menu.css
@@ -1,29 +1,30 @@
 ul.left-menu {
-    list-style-type: none;
-    padding: 0;
-    margin: 0 20px 0 -10px;
+	list-style-type: none;
+	padding: 0;
+	margin: 0 20px 0 -10px;
 }
 
 ul.left-menu li {
-    padding: 0;
-    margin: 0;
-    background: none repeat scroll 0 0 transparent;
-    border: 0 none;
-    font-family: Arial,sans-serif;
-    font-size: 16px;
-    outline: 0 none;
-    vertical-align: middle;
+	padding: 0;
+	margin: 0;
+	background: none repeat scroll 0 0 transparent;
+	border: 0 none;
+	font-family: Arial,sans-serif;
+	font-size: 16px;
+	outline: 0 none;
+	vertical-align: middle;
 }
 
 ul.left-menu a {
-    margin: 0;
-    display: block;
-    border-bottom: 1px solid #ccc;
-    height: 50px;
-    line-height: 50px;
-    padding-left: 20px;
-    text-decoration: none;
-    font-size: 100%;
+	margin: 0;
+	display: block;
+	border-bottom: 1px solid #ccc;
+	height: 50px;
+	line-height: 50px;
+	padding-left: 20px;
+	text-decoration: none;
+	font-size: 100%;
+	white-space: nowrap; 
 }
 
 ul.left-menu a.collapsed {
@@ -33,31 +34,31 @@ ul.left-menu a.collapsed {
 ul.left-menu a:hover,
 ul.left-menu a:visited,
 ul.left-menu a:active{
-    text-decoration: none;
-    cursor: pointer;
-    color: #444;
+	text-decoration: none;
+	cursor: pointer;
+	color: #444;
 }
 
 ul.left-menu li a.open {
-    color: #e60000;
-    font-weight: bold;
+	color: #e60000;
+	font-weight: bold;
 }
 
 ul.left-sub-menu {
-    list-style-type: none;
-    padding: 0;
-    margin: -10px 0 10px 20px;
+	list-style-type: none;
+	padding: 0;
+	margin: -10px 0 10px 20px;
 }
 
 ul.left-sub-menu li {
-    padding: 0;
-    margin: 0;
-    background: none repeat scroll 0 0 transparent;
-    border: 0 none;
-    font-family: Arial,sans-serif;
-    font-size: 16px;
-    outline: 0 none;
-    vertical-align: middle;
+	padding: 0;
+	margin: 0;
+	background: none repeat scroll 0 0 transparent;
+	border: 0 none;
+	font-family: Arial,sans-serif;
+	font-size: 16px;
+	outline: 0 none;
+	vertical-align: middle;
 }
 
 
diff --git a/luciexpress/htdocs/plugins/core/css/overview.css b/luciexpress/htdocs/plugins/core/css/overview.css
index c5097073d..b76b4adda 100644
--- a/luciexpress/htdocs/plugins/core/css/overview.css
+++ b/luciexpress/htdocs/plugins/core/css/overview.css
@@ -1,8 +1,8 @@
 .overview-list-item-text {
-    height: 32px;
-    line-height: 34px;
+	height: 32px;
+	line-height: 34px;
 }
 
 .overview-list-item-label {
-    margin-top: 7px;
-}
\ No newline at end of file
+	margin-top: 7px;
+}
diff --git a/luciexpress/htdocs/plugins/core/css/radio.css b/luciexpress/htdocs/plugins/core/css/radio.css
index 49190a8e4..dcf1789a9 100644
--- a/luciexpress/htdocs/plugins/core/css/radio.css
+++ b/luciexpress/htdocs/plugins/core/css/radio.css
@@ -3,12 +3,12 @@
 }
 
 .radio-info input[type="radio"] + label::after {
-    background-color: #64bd63;
+	background-color: #64bd63;
 }
 .radio-info input[type="radio"]:checked + label::before {
-    border-color: #808080;
+	border-color: #808080;
 }
 .radio-info input[type="radio"]:checked + label::after {
-    background-color: #64bd63;
+	background-color: #64bd63;
 }
 
diff --git a/luciexpress/htdocs/plugins/core/widgets/core.modal.html b/luciexpress/htdocs/plugins/core/widgets/core.modal.html
index 05e1840d4..4b7e93dea 100644
--- a/luciexpress/htdocs/plugins/core/widgets/core.modal.html
+++ b/luciexpress/htdocs/plugins/core/widgets/core.modal.html
@@ -5,7 +5,7 @@
 				<button ng-hide="hideCloseBtn" type="button" class="close" ng-click="onDismiss()" aria-hidden="true">&times;</button>
 				<h3 class="modal-title">{{title|translate}}</h3>
 			</div>
-            <div ng-show="formIncluded" ng-transclude></div>
+			<div ng-show="formIncluded" ng-transclude></div>
 			<div ng-hide="formIncluded" class="modal-body" ng-transclude></div>
 			<div ng-hide="formIncluded" class="modal-footer">
 				<button class="btn btn-primary" ng-show="acceptLabel" ng-click="onAccept()">{{acceptLabel}}</button>
diff --git a/luciexpress/htdocs/plugins/core/widgets/luci.select.js b/luciexpress/htdocs/plugins/core/widgets/luci.select.js
index 3b680226e..fd2681037 100644
--- a/luciexpress/htdocs/plugins/core/widgets/luci.select.js
+++ b/luciexpress/htdocs/plugins/core/widgets/luci.select.js
@@ -19,7 +19,7 @@ $juci.module("core")
 				html += '<div class="dropdown dropdown-toggle" data-toggle="dropdown" ><a class="dropdown-toggle" role="button" data-toggle="dropdown"  href="javascript:;">{{((selectedItem||{}).label || placeholder) | translate}}<b class="caret"></b></a>';
 				break;
 			default:
-				html += '<div class="btn-group" style="white-space: nowrap;"><button class="btn btn-default button-label {{size_class}}" style="display: inline-block; float:none;">{{selectedText}}</button><button class="btn btn-default dropdown-toggle" style="display: inline-block; float:none;" data-toggle="dropdown"><span class="caret"></span></button>';
+				html += '<div class="btn-group" style="white-space: nowrap;"><button class="btn btn-default button-label {{size_class}}" style="display: inline-block; float:none;">{{selectedText | translate}}</button><button class="btn btn-default dropdown-toggle" style="display: inline-block; float:none;" data-toggle="dropdown"><span class="caret"></span></button>';
 				break;
 		}
 		html += '<ul class="dropdown-menu"><li ng-repeat="item in itemList"><a tabindex="-1" data-ng-click="selectVal(item)" href="">{{item.label}}</a></li></ul></div>';
@@ -38,17 +38,17 @@ $juci.module("core")
 				scope.itemList = value.map(function(x){
 					//console.log(JSON.stringify(x)+" "+JSON.stringify(scope.selectedItem));
 					if(typeof x == "object" && "value" in x){
-						if(scope.selectedItem != undefined && scope.selectedItem.value == x.value)
+						/*if(scope.selectedItem != undefined && scope.selectedItem.value == x.value)
 							scope.selectedText = scope.selectedItem.label || scope.placeholder;
 						else if(scope.selectedItem == x.value){
 							scope.selectedText = x.label || scope.placeholder; 
-						}
+						}*/
 						//console.log(JSON.stringify(x)+" "+JSON.stringify(scope.selectedItem));
 						return { label: x.label, value: x.value }; 
 					} else {
-                        if(scope.selectedItem == x){
+						/*if(scope.selectedItem == x){
 							scope.selectedText = scope.selectedItem || scope.placeholder; 
-						}
+						}*/
 						return { label: x, value: x }; 
 					}
 				}); 
@@ -57,7 +57,7 @@ $juci.module("core")
 		scope.$watch("selectedItem", function(value){
 			//console.log("Selected item: "+JSON.stringify(value));
 			if(value != undefined && (typeof value) == "object") {
-				if("value" in value) scope.selectedText = value.value; 
+				if("value" in value) scope.selectedText = value.label; 
 				else scope.selectedText = scope.placeholder; 
 			}
 			else if(value != undefined && scope.itemList != undefined) { 
@@ -65,7 +65,7 @@ $juci.module("core")
 					if(x.value == value) scope.selectedText = x.label;
 				}); 
 			} 
-			else scope.selectedText = value || scope.placeholder; 
+			//else scope.selectedText = value || scope.placeholder; 
 		}); 
 		
 		scope.selectVal = function (item) {
diff --git a/luciexpress/htdocs/themes/vodafone/vodafone.js b/luciexpress/htdocs/themes/vodafone/vodafone.js
index 6ba09eb4c..88cf7bdd7 100644
--- a/luciexpress/htdocs/themes/vodafone/vodafone.js
+++ b/luciexpress/htdocs/themes/vodafone/vodafone.js
@@ -5,7 +5,7 @@ angular.module("luci").config(function($provide){
 		"luciLayoutSingleColumnDirective": "/widgets/luci.layout.single_column.html", 
 		"luciLayoutWithSidebarDirective": "/widgets/luci.layout.with_sidebar.html", 
 		"luciNavbarDirective": "/widgets/luci.navbar.html",
-		//"luciTopBarDirective": "/widgets/luci.top_bar.html"
+		"luciTopBarDirective": "/widgets/luci.top_bar.html"
 	}; 
 	var plugin_root = "/themes/vodafone/"; 
 	Object.keys(overrides).map(function(k){
diff --git a/luciexpress/htdocs/themes/vodafone/widgets/luci.top_bar.html b/luciexpress/htdocs/themes/vodafone/widgets/luci.top_bar.html
index 2f34da2e1..7e2028b0b 100644
--- a/luciexpress/htdocs/themes/vodafone/widgets/luci.top_bar.html
+++ b/luciexpress/htdocs/themes/vodafone/widgets/luci.top_bar.html
@@ -1,23 +1,14 @@
 <div class="top-bar">
-    <div class="container">
-        <div class="row">
-            <div class="col-xs-1"></div>
-            <div class="col-xs-10">
-                <div class="outer-select">
-                    <ui-select ng-model="selectedMode"
-                               theme="bootstrap"
-                               search-enabled="false"
-                               on-select="onChangeMode($item, $model)"
-                               class="inner-select" >
-                        <ui-select-match placeholder="{{'Basic'|translate}}">{{$select.selected.label}}</ui-select-match>
-                        <ui-select-choices repeat="mode in guiModes" refresh-delay="0">
-                            <div>{{mode.label}}</div>
-                        </ui-select-choices>
-                    </ui-select>
-                </div>
-                <div class="box-model">{{ model }}</div>
-            </div>
-            <div class="col-xs-1"></div>
-        </div>
-    </div>
+	<div class="container">
+		<div class="row">
+			<div class="col-xs-1"></div>
+			<div class="col-xs-10">
+				<div class="outer-select">
+					<luci-select ng-model="selectedModeValue" ng-items="guiModes" on-change="onChangeMode()"></luci-select>
+				</div>
+				<div class="box-model">{{ model }}</div>
+			</div>
+			<div class="col-xs-1"></div>
+		</div>
+	</div>
 </div>