diff --git a/config/env/all.js b/config/env/all.js
index c814a775..f49acb5b 100755
--- a/config/env/all.js
+++ b/config/env/all.js
@@ -7,7 +7,7 @@ module.exports = {
 		description: process.env.APP_DESC || 'Opensource form builder alternative to TypeForm',
 		keywords:  process.env.APP_KEYWORDS || 'typeform, pdfs, forms, opensource, formbuilder, google forms, nodejs'
 	},
-	port: process.env.PORT || 3000,
+	port: process.env.PORT || 5000,
 	socketPort: process.env.SOCKET_PORT || 35729,
 
 	templateEngine: 'swig',
diff --git a/public/modules/forms/base/views/directiveViews/field/dropdown.html~HEAD b/public/modules/forms/base/views/directiveViews/field/dropdown.html~HEAD
new file mode 100755
index 00000000..c0e98b75
--- /dev/null
+++ b/public/modules/forms/base/views/directiveViews/field/dropdown.html~HEAD
@@ -0,0 +1,27 @@
+<div class="field row dropdown" ng-click="setActiveField(field._id, index, true)" ng-if="field.fieldOptions.length > 0">
+    <div class="col-xs-12 field-title" ng-style="{'color': design.colors.questionColor}">
+	    <h3>
+	    	<span class="fa fa-angle-double-right"></span>
+	    	{{field.title}}
+	    	<span class="required-error" ng-show="!field.required">{{ 'OPTIONAL' | translate }}</span>
+	    </h3>
+    </div>
+    <div class="col-xs-12 field-input ">
+		<ui-select ng-model="field.fieldValue"
+                theme="selectize"
+				ng-model-options="{ debounce: 250 }"
+				ng-required="field.required"
+				ng-disabled="field.disabled"
+				ng-focus="setActiveField(field._id, index, true)">
+			<ui-select-match placeholder="Type or select an option">
+				{{$select.selected.option_value}}
+			</ui-select-match>
+			<ui-select-choices
+                repeat="option in field.fieldOptions | filter: $select.search"
+				ng-class="{'active': option.option_value === field.fieldValue }">
+				<span ng-bind-html="option.option_value | highlight: $select.search"></span>
+			</ui-select-choices>
+        </ui-select>
+    </div>
+</div>
+<br>