diff --git a/web/org.openbravo.retail.returns/js/modalproductattributeverifiedreturns.js b/web/org.openbravo.retail.returns/js/modalproductattributeverifiedreturns.js
--- a/web/org.openbravo.retail.returns/js/modalproductattributeverifiedreturns.js
+++ b/web/org.openbravo.retail.returns/js/modalproductattributeverifiedreturns.js
@@ -13,23 +13,35 @@
 
 enyo.kind({
   name: 'OB.UI.ModalScrollerVerifiedReturn.ReturnLine',
+  classes: 'flexContainer',
   components: [{
     classes: 'properties-label',
-    name: 'productName',
-    type: 'text',
-    style: 'font-size: 17px;margin-top:4px'
+    components: [{
+      name: 'productName',
+      type: 'text',
+      style: 'font-size: 17px;',
+      classes: 'modal-dialog-receipt-properties-label',
+      content: ''
+    }]
   }, {
-    kind: 'OB.UI.renderTextProperty',
-    name: 'valueAttribute',
-    maxlength: '70',
-    style: 'width: 55%',
-    handlers: {
-      oninput: 'blur'
-    },
-    blur: function () {
-      this.bubble('onFieldChanged');
-    },
-    placeholder: 'Scan attribute'
+    classes: 'properties-component',
+    components: [{
+      name: 'newAttribute',
+      classes: 'modal-dialog-receipt-properties-text',
+      components: [{
+        kind: 'OB.UI.renderTextProperty',
+        name: 'valueAttribute',
+        style: 'color: white',
+        maxlength: '70',
+        handlers: {
+          oninput: 'blur'
+        },
+        blur: function () {
+          this.bubble('onFieldChanged');
+        },
+        placeholder: 'Scan attribute'
+      }]
+    }]
   }, {
     name: 'productId',
     type: 'text',
@@ -86,7 +98,7 @@
         i, line = me.args.line;
     for (i = 0; i < line.length; i++) {
       me.$.bodyContent.$.verifiedReturns.$['returnLine' + i].$.valueAttribute.setValue(null);
-      me.$.bodyContent.$.verifiedReturns.$['returnLine' + i].$.valueAttribute.addStyles('background-color: none; width: 55%');
+      me.$.bodyContent.$.verifiedReturns.$['returnLine' + i].$.valueAttribute.addStyles('background-color: none;');
     }
     me.$.bodyButtons.$.modalDialogButton.setDisabled(true);
     return;
@@ -114,10 +126,10 @@
       inpAttribute = me.$.bodyContent.$.verifiedReturns.$['returnLine' + lineIndex].$.valueAttribute.getValue();
       if (inpAttribute) {
         if ((orderlineAttribute !== inpAttribute) && (orderlineProduct === inpProduct)) {
-          me.$.bodyContent.$.verifiedReturns.$['returnLine' + lineIndex].$.valueAttribute.addStyles('background-color: red; width: 55%');
+          me.$.bodyContent.$.verifiedReturns.$['returnLine' + lineIndex].$.valueAttribute.addStyles('background-color: red;');
           validAttribute = false;
         } else {
-          me.$.bodyContent.$.verifiedReturns.$['returnLine' + lineIndex].$.valueAttribute.addStyles('background-color: #6cb33f; width: 55%');
+          me.$.bodyContent.$.verifiedReturns.$['returnLine' + lineIndex].$.valueAttribute.addStyles('background-color: #6cb33f;');
           validAttribute = true;
           focusIndex = line.length === 0 ? 0 : lineIndex + 1;
           if (focusIndex < line.length) {