diff --git a/submodules/callLogs/callLogs.css b/submodules/callLogs/callLogs.css
index 74c666c..8a70edb 100644
--- a/submodules/callLogs/callLogs.css
+++ b/submodules/callLogs/callLogs.css
@@ -35,7 +35,7 @@
 }
 
 #call_logs_container .fixed-ranges-date .highlight-date {
-	color: #22CCFF;
+	color: #22a5ff;
 	font-weight: bold;
 	margin: 0 5px;
 }
@@ -91,13 +91,7 @@
 	border-bottom-right-radius: 4px;
 }
 #call_logs_container .grid-row.header-row {
-	background-color: #22ccff;
-	background-image: linear-gradient(to bottom,#22ccff,#22a5ff);
-	background-image: -moz-linear-gradient(top,#22ccff,#22a5ff);
-	background-image: -webkit-gradient(linear,0 0,0 100%,from(#22ccff),to(#22a5ff));
-	background-image: -webkit-linear-gradient(top,#22ccff,#22a5ff);
-	background-image: -o-linear-gradient(top,#22ccff,#22a5ff);
-	filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff22ccff',endColorstr='#ff22a5ff',GradientType=0);
+	background-color: #22a5ff;
 	color: #fff;
 	text-shadow: 1px 1px 1px #666666;
 	font-weight: 600;
@@ -117,7 +111,7 @@
 	display: none;
 }
 #call_logs_container .grid-row-group:not(.open) .grid-row.a-leg.has-b-legs > .grid-cell:first-child {
-	border-left: solid 2px #22ccff;
+	border-left: solid 2px #22a5ff;
 }
 #call_logs_container .grid-row-group.open .grid-row > .grid-cell:first-child {
 	border-left: solid 2px #44cc44;
@@ -173,7 +167,7 @@
 	width: 10%;
 }
 #call_logs_container .grid-cell.details i:hover {
-	color: #22ccff;
+	color: #22a5ff;
 	cursor: pointer;
 }
 #call_logs_container .grid-cell.report {
diff --git a/submodules/devices/devices.css b/submodules/devices/devices.css
index d6ad4d2..28489e8 100644
--- a/submodules/devices/devices.css
+++ b/submodules/devices/devices.css
@@ -17,7 +17,7 @@
 	display: inline-block;
 	margin-top: -5px;
 	margin-left: 15px;
-	color: #22ccff;
+	color: #22a5ff;
 	font-weight: 600;
 	font-size: 28px;
 }
@@ -58,7 +58,7 @@
 }
 
 #devices_container .devices-header .add-device:hover i {
-	color: #22ccff;
+	color: #22a5ff;
 }
 
 #devices_container .devices-header .search-box { margin: 16px 0 16px 15px; }
@@ -220,6 +220,10 @@
 }
 
 /* Adding / Edition Devices Popups */
+.overflow-visible .ui-dialog-content {
+	overflow: visible;
+}
+
 .edit-device {
 	width: 700px;
 }
@@ -271,7 +275,7 @@
 }
 
 .edit-device .content .tabs-section .title {
-	color: #22CCFF;
+	color: #22a5ff;
 	font-size: 24px;
 	margin-bottom: 30px;
 	margin-left: 40px;
diff --git a/submodules/devices/devices.js b/submodules/devices/devices.js
index 5580a37..2261f7d 100644
--- a/submodules/devices/devices.js
+++ b/submodules/devices/devices.js
@@ -164,7 +164,7 @@ define(function(require){
 								dataDevice.provision.feature_keys = {};
 							}
 
-							for (var i = 0, len = template.feature_keys.iterate - 1; i < len; i++) {
+							for (var i = 1, len = template.feature_keys.iterate; i < len; i++) {
 								if (!dataDevice.provision.feature_keys.hasOwnProperty(i)) {
 									dataDevice.provision.feature_keys[i] = { type: 'none' };
 								}
@@ -284,7 +284,7 @@ define(function(require){
 				});
 
 				$.each(templateDevice.find('.feature-key-index'), function(idx, val) {
-					$(val).text(parseInt($(val).text(), 10) + 2);
+					$(val).text(parseInt($(val).text(), 10) + 1);
 				});
 			}
 
@@ -493,7 +493,8 @@ define(function(require){
 
 			var popup = monster.ui.dialog(templateDevice, {
 				position: ['center', 20],
-				title: popupTitle
+				title: popupTitle,
+				dialogClass: 'overflow-visible'
 			});
 		},
 
@@ -546,6 +547,20 @@ define(function(require){
 				});
 			}
 
+			/**
+			 * form2object sends feature_keys back as an array even if the first key is 1
+			 * feature_key needs to be coerced into an object to match the datatype in originalData
+			 */
+			if (formData.hasOwnProperty('provision') && formData.provision.hasOwnProperty('feature_keys')) {
+				var featureKeys = {};
+
+				formData.provision.feature_keys.forEach(function(val, idx) {
+					featureKeys[idx + 1] = val;
+				});
+
+				formData.provision.feature_keys = featureKeys;
+			}
+
 			var mergedData = $.extend(true, {}, originalData, formData);
 
 			/* The extend doesn't override an array if the new array is empty, so we need to run these snippet after the merge */
@@ -577,14 +592,11 @@ define(function(require){
 				delete mergedData.media.fax.option;
 			}
 
+			// Remove feature keys that are not defined
 			if (mergedData.hasOwnProperty('provision') && mergedData.provision.hasOwnProperty('feature_keys')) {
-				var tmp = mergedData.provision.feature_keys;
-
-				mergedData.provision.feature_keys = {};
-
-				for (var i = 0, len = tmp.length; i < len; i++) {
-					if (tmp[i].type !== 'none') {
-						mergedData.provision.feature_keys[i] = tmp[i];
+				for (var key in mergedData.provision.feature_keys) {
+					if (mergedData.provision.feature_keys[key].type === 'none') {
+						delete mergedData.provision.feature_keys[key];
 					}
 				}
 
diff --git a/submodules/groups/groups.css b/submodules/groups/groups.css
index 6f084ca..2feb239 100644
--- a/submodules/groups/groups.css
+++ b/submodules/groups/groups.css
@@ -27,7 +27,7 @@
 	display: inline-block;
 	margin-top: -5px;
 	margin-left: 15px;
-	color: #22ccff;
+	color: #22a5ff;
 	font-weight: 600;
 	font-size: 28px;
 }
@@ -69,7 +69,7 @@
 }
 
 #groups_container .groups-header .add-group:hover i {
-	color: #22ccff;
+	color: #22a5ff;
 }
 
 #groups_container .groups-header .search-box { margin: 16px 0 16px 15px; }
diff --git a/submodules/myOffice/myOffice.css b/submodules/myOffice/myOffice.css
index 0911d54..e89207b 100644
--- a/submodules/myOffice/myOffice.css
+++ b/submodules/myOffice/myOffice.css
@@ -1,7 +1,7 @@
 /********** Header **********/
 #myoffice_container .dashboard-header {
 	height: 60px;
-	background-color: #22ccff;
+	background-color: #22a5ff;
 	color: #fff;
 	border: 1px solid #dcdcdc;  border-radius: 4px;
 	margin-bottom: 20px;
@@ -105,7 +105,7 @@
 }
 #myoffice_container .dashboard-left-content .left-section-header .number {
 	font-size: 24px;
-	color: #22ccff;
+	color: #22a5ff;
 	float: right;
 }
 #myoffice_container .dashboard-left-content .left-section-content {
@@ -149,7 +149,7 @@
 	font-weight: bold;
 }
 #myoffice_container .devices-section-content .unregistered-devices .value.none {
-	color: #22ccff;
+	color: #22a5ff;
 }
 #myoffice_container .devices-section-content .unregistered-devices {
 	margin-top: 25px;
@@ -243,7 +243,7 @@
 	line-height: 25px;
 }
 #myoffice_container .dashboard-right-content .dashboard-box .dashboard-box-row .row-content .number-list li.caller-id {
-	color: #22ccff;
+	color: #22a5ff;
 }
 #myoffice_container .dashboard-right-content .dashboard-box .dashboard-box-row .row-content .number-list .features > i {
 	display: none;
@@ -291,7 +291,7 @@
 #myoffice_container .dashboard-right-content .dashboard-box .dashboard-box-div .div-title .number {
 	float: right;
 	margin-right: 10px;
-	color: #22ccff;
+	color: #22a5ff;
 }
 #myoffice_container .dashboard-right-content .dashboard-box .dashboard-box-div > :not(:last-child) {
 	border-bottom: solid 1px #dcdcdc
diff --git a/submodules/strategy/strategy.css b/submodules/strategy/strategy.css
index ddd7412..54dd942 100644
--- a/submodules/strategy/strategy.css
+++ b/submodules/strategy/strategy.css
@@ -78,7 +78,7 @@
 	-moz-transform: rotate(90deg);
 	-ms-transform: rotate(90deg);
 	-o-transform: rotate(90deg);
-	color: #22ccff;
+	color: #22a5ff;
 }
 
 #strategy_container .element-container .basic-actions {
@@ -94,7 +94,7 @@
 }
 
 #strategy_container .element-container:not(.strategy-confnum) .title .icon-phone {
-	color: #22ccff;
+	color: #22a5ff;
 }
 
 /************** Main Numbers **************/
@@ -281,7 +281,7 @@
 }
 
 #strategy_container .element-container.strategy-holidays .holidays-div .holidays-add .dropdown-toggle {
-	color: #22ccff;
+	color: #22a5ff;
 	background-color: transparent;
 }
 
@@ -433,6 +433,7 @@
 }
 
 #strategy_container .element-container.strategy-calls .callflow-tabs {
+	overflow: visible;
 	padding: 20px;
 	border: none;
 	background: transparent;
@@ -472,6 +473,10 @@
 	margin-top: 10px;
 }
 
+#strategy_container .element-container.strategy-calls .callflow-tabs .call-option .chosen-container {
+	text-align: left;
+}
+
 #strategy_container .element-container.strategy-calls .callflow-tabs .call-option .menu-div .link-icon i {
 	margin-right: 5px;
 }
@@ -503,7 +508,7 @@
 }
 
 #strategy_container .element-container.strategy-calls .callflow-tabs .call-option.active .menu-div.has-menu .menu-icon i {
-	color: #22ccff;
+	color: #22a5ff;
 }
 
 /********** Strategy Conference ***********/
diff --git a/submodules/strategy/strategy.js b/submodules/strategy/strategy.js
index d4cef78..1e9087f 100644
--- a/submodules/strategy/strategy.js
+++ b/submodules/strategy/strategy.js
@@ -411,9 +411,12 @@ define(function(require){
 
 						$.each(template.find('.user-select select'), function() {
 							var $this = $(this);
+							$this.chosen({ search_contains: true, width: '160px' });
 							$this.siblings('.title').text($this.find('option:selected').closest('optgroup').prop('label'));
 						});
 
+						template.find('.voicemail-select select').chosen({ search_contains: true, width: '160px' });
+
 						callback && callback();
 						break;
 					default:
diff --git a/submodules/users/users.css b/submodules/users/users.css
index 4ac1a97..4a4e5d4 100644
--- a/submodules/users/users.css
+++ b/submodules/users/users.css
@@ -27,7 +27,7 @@
 	display: inline-block;
 	margin-top: -5px;
 	margin-left: 15px;
-	color: #22ccff;
+	color: #22a5ff;
 	font-weight: 600;
 	font-size: 28px;
 }
@@ -63,7 +63,7 @@
 }
 
 #users_container .users-header .add-user:hover i {
-	color: #22ccff;
+	color: #22a5ff;
 }
 
 #users_container .users-header .search-box { margin: 16px 0 16px 15px; }
@@ -870,7 +870,7 @@
 
 .presence-id-change-wrapper .list-choices .presence-id-option.active {
 	background: #FFF;
-	border: 1px solid #22CCFF;
+	border: 1px solid #22a5ff;
 }
 
 .presence-id-change-wrapper .actions {
diff --git a/submodules/vmboxes/vmboxes.css b/submodules/vmboxes/vmboxes.css
index f21b405..d24144c 100644
--- a/submodules/vmboxes/vmboxes.css
+++ b/submodules/vmboxes/vmboxes.css
@@ -17,7 +17,7 @@
 	display: inline-block;
 	margin-top: -5px;
 	margin-left: 15px;
-	color: #22ccff;
+	color: #22a5ff;
 	font-weight: 600;
 	font-size: 28px;
 }
@@ -57,7 +57,7 @@
 }
 
 #vmboxes_container .vmboxes-header .add-vmbox:hover i {
-	color: #22ccff;
+	color: #22a5ff;
 }
 
 #vmboxes_container .vmboxes-header .search-box { margin: 16px 0 16px 15px; }
@@ -217,7 +217,7 @@
 }
 
 .edit-vmbox .content .tabs-section .title {
-	color: #22CCFF;
+	color: #22a5ff;
 	font-size: 24px;
 	margin-bottom: 30px;
 	margin-left: 40px;