diff --git a/cit-esi-api/src/main/java/br/com/centralit/esi/api/resource/model/FormComponent.java b/cit-esi-api/src/main/java/br/com/centralit/esi/api/resource/model/FormComponent.java
index 3ab383f..50397a6 100644
--- a/cit-esi-api/src/main/java/br/com/centralit/esi/api/resource/model/FormComponent.java
+++ b/cit-esi-api/src/main/java/br/com/centralit/esi/api/resource/model/FormComponent.java
@@ -27,7 +27,7 @@ import com.fasterxml.jackson.annotation.JsonView;
 
 @Entity
 @Table(name="RES_FormComponent")
-@JsonIgnoreProperties({ "$type", "rowIndex" })
+@JsonIgnoreProperties({ "$type", "rowIndex", "rowIndexInput" })
 public class FormComponent extends PersistentObject {
 
 	/**
diff --git a/cit-esi-web/src/main/java/br/com/centralit/listener/StartupListenerEsi.java b/cit-esi-web/src/main/java/br/com/centralit/listener/StartupListenerEsi.java
index b66ea59..a42e0a0 100644
--- a/cit-esi-web/src/main/java/br/com/centralit/listener/StartupListenerEsi.java
+++ b/cit-esi-web/src/main/java/br/com/centralit/listener/StartupListenerEsi.java
@@ -1635,7 +1635,18 @@ public class StartupListenerEsi extends UtilStartup implements ApplicationListen
 			formWidget.getProperties().add(new FormWidgetProperty(formWidget, this.findProperty("ng-obrigatorio", properties)));
 			formWidget.getProperties().add(new FormWidgetProperty(formWidget, this.findProperty("ng-disabled", properties)));
 			
-			formWidget.setTemplateCode("<auto-complete ng-id=\"component_{{component.rowIndex}}_{{component.index}}\" ng-label=\"{{component['ng-label']}}\" ng-model=\"model\" ng-item=\"item\" />");
+			String html = "<div class=\"form-group\" >\n"+
+			"	<label ><translate>{{component['ng-label']}}</translate>\n"+
+			"	</label>\n"+
+			"	<div id=\"{{id}}\" class=\"input-group\">\n"+
+			"		<input class=\"form-control typeahead-wide\" type=\"text\"/>\n"+
+			"		<span class=\"input-group-addon\">\n"+
+			"			<i class=\"fa fa-search bigger-110\"></i>\n"+
+			"		</span>\n"+
+			"	</div>\n"+
+			"</div>";
+			
+			formWidget.setTemplateCode(html);
 			formWidget.setHtmlCode("<auto-complete ng-id=\"${id}\" form=\"${form}\" " + this.buildHTMLProperties(formWidget) + " />");
 			formWidgetService.save(formWidget);	
 		}
@@ -1658,7 +1669,18 @@ public class StartupListenerEsi extends UtilStartup implements ApplicationListen
 			formWidget.getProperties().add(new FormWidgetProperty(formWidget, this.findProperty("ng-obrigatorio", properties)));
 			formWidget.getProperties().add(new FormWidgetProperty(formWidget, this.findProperty("ng-disabled", properties)));
 			
-			formWidget.setTemplateCode("<auto-complete ng-id=\"component_{{component.rowIndex}}_{{component.index}}\" ng-label=\"{{component['ng-label']}}\" ng-model=\"model\" />");
+			String html = "<div class=\"form-group\" >\n"+
+			"	<label ><translate>{{component['ng-label']}}</translate>\n"+
+			"	</label>\n"+
+			"	<div id=\"{{id}}\" class=\"input-group\">\n"+
+			"		<input class=\"form-control typeahead-wide\" type=\"text\"/>\n"+
+			"		<span class=\"input-group-addon\">\n"+
+			"			<i class=\"fa fa-search bigger-110\"></i>\n"+
+			"		</span>\n"+
+			"	</div>\n"+
+			"</div>";
+			
+			formWidget.setTemplateCode(html);
 			formWidget.setHtmlCode("<esi-data-search ng-if=\"${ng-target}\" ng-id=\"${id}\" form=\"${form}\" " + this.buildHTMLProperties(formWidget) + " />");
 			formWidgetService.save(formWidget);	
 		}
diff --git a/cit-esi-web/src/main/webapp/assets/js/angular/custom/directive/FormBuilderDirective.js b/cit-esi-web/src/main/webapp/assets/js/angular/custom/directive/FormBuilderDirective.js
index 79a69fb..9f4e8b1 100644
--- a/cit-esi-web/src/main/webapp/assets/js/angular/custom/directive/FormBuilderDirective.js
+++ b/cit-esi-web/src/main/webapp/assets/js/angular/custom/directive/FormBuilderDirective.js
@@ -210,7 +210,7 @@ citApp.directive("formBuilder", ['ImageRepository', '$translate', '$filter', '$t
 		    	if (!row.htmlOnly) {
 			    	var width = !$scope.isMaxWidth(widget) ? $scope.getWidth(row) : 12;
 			    	if (width > 0) {
-			    		var component = {widget: widget, rowIndex: row.index, index: row.components.length, width: width};
+			    		var component = {widget: widget, rowIndex: row.index, rowIndexInput: row.index+1, index: row.components.length, width: width};
 			    		row.components.push(component);
 			    		$scope.addProperties(component);
 			    		return component;
@@ -385,6 +385,20 @@ citApp.directive("formBuilder", ['ImageRepository', '$translate', '$filter', '$t
 		    	}
 		    }
 		    
+		    $scope.changeComponentRow = function(component) {
+		    	if (component.rowIndexInput != component.rowIndex + 1) {
+		    		var row = $scope.formContainer.rows[component.rowIndex];
+		    		row.components.splice(component.index, 1);
+		    		$scope.reorderComponents(row);
+		    		
+		    		component.rowIndex = component.rowIndexInput - 1;
+		    		row = $scope.formContainer.rows[component.rowIndex];
+		    		component.index = row.components.length - 1;
+		    		row.components.push(component);
+		    		$scope.reorderComponents(row);
+		    	}
+		    }
+		    
 		    $scope.allowRowUp = function(row) {
 		    	if (row) {
 		    		return row.index > 0;
@@ -436,6 +450,7 @@ citApp.directive("formBuilder", ['ImageRepository', '$translate', '$filter', '$t
 				var index = 0;
 				angular.forEach(row.components, function(component){
 					component.rowIndex = row.index;
+					component.rowIndexInput = row.index+1;
 					component.index = index;
 					index ++;
 				});
diff --git a/cit-esi-web/src/main/webapp/assets/js/angular/custom/directive/html/formBuilder.html b/cit-esi-web/src/main/webapp/assets/js/angular/custom/directive/html/formBuilder.html
index 31ea2cd..bdf5f79 100644
--- a/cit-esi-web/src/main/webapp/assets/js/angular/custom/directive/html/formBuilder.html
+++ b/cit-esi-web/src/main/webapp/assets/js/angular/custom/directive/html/formBuilder.html
@@ -161,6 +161,19 @@
 									</div>
 								</div>
 							</div>
+							<div class="form-group" >
+								<label for=currentComponent.rowIndexInput> <translate> <span class="">ESI.LINHA</span></translate>
+									<i class="fa fa-info-circle" tooltip-placement="top"
+									tooltip="Linha do componente"
+									tooltip-append-to-body="true"></i>
+								</label>
+								<div class="inner-addon left-addon">
+									<i class="fa fa-align-justify bold text-normal"></i> <input
+										ng-model="currentComponent.rowIndexInput" type="number"
+										class="form-control property--width input-sm ng-valid ng-valid-min ng-valid-max ng-dirty ng-touched"
+										id="currentComponent.rowIndexInput" min="1" max="{{formContainer.rows.length}}" ng-change="changeComponentRow(currentComponent)">
+								</div>
+							</div>
 							<div style="height:395px;overflow-x: hidden;overflow-y: auto; padding: 0px 0px 0px 0px"> 
 								<div class='row no-padding' ng-if="currentComponent.widget.type.name == 'HTML'">
 									<label-ui-ace ng-label="ESI.HTML" ng-theme="eclipse" ng-mode="html" ng-model="currentComponent.htmlCode" 
diff --git a/cit-esi-web/src/main/webapp/assets/js/angular/custom/utils/FormContainerHelper.js b/cit-esi-web/src/main/webapp/assets/js/angular/custom/utils/FormContainerHelper.js
index 224721b..02b58fe 100644
--- a/cit-esi-web/src/main/webapp/assets/js/angular/custom/utils/FormContainerHelper.js
+++ b/cit-esi-web/src/main/webapp/assets/js/angular/custom/utils/FormContainerHelper.js
@@ -89,6 +89,7 @@ FormContainerHelper.setProperties = function(formContainer) {
 		var componentIndex = 0;
 		angular.forEach(row.components, function(component){
 			component.rowIndex = row.index;
+			component.rowIndexInput = row.index + 1;
 			component.index = componentIndex;
 			componentIndex ++;
 			
--
libgit2 0.21.2