diff --git a/public/admin/controller/catalog/product.php b/public/admin/controller/catalog/product.php
index 6c45f23..7c2ee2c 100644
--- a/public/admin/controller/catalog/product.php
+++ b/public/admin/controller/catalog/product.php
@@ -1350,27 +1350,63 @@ if (isset($this->request->post['price_3'])) {
 
 		// Attributes
 		$this->load->model('catalog/attribute');
+		$this->load->model('catalog/attribute_group');
+
+		$attribute_groups = $this->model_catalog_attribute_group->getAttributeGroups();
+
+		$saved_attributes = array();
 
 		if (isset($this->request->post['product_attribute'])) {
-			$product_attributes = $this->request->post['product_attribute'];
+			$saved_attributes_raw = $this->request->post['product_attribute'];
+
+			foreach ($saved_attributes_raw as $attr_id => $attr_data) {
+				if (!empty($attr_data['product_attribute_description'])) {
+					$saved_attributes[] = array(
+						'attribute_id'                  => $attr_id,
+						'product_attribute_description' => $attr_data['product_attribute_description']
+					);
+				}
+			}
 		} elseif (isset($this->request->get['product_id'])) {
-			$product_attributes = $this->model_catalog_product->getProductAttributes($this->request->get['product_id']);
-		} else {
-			$product_attributes = array();
+			$saved_attributes = $this->model_catalog_product->getProductAttributes($this->request->get['product_id']);
 		}
 
-		$data['product_attributes'] = array();
+		$data['attribute_groups'] = array();
 
-		foreach ($product_attributes as $product_attribute) {
-			$attribute_info = $this->model_catalog_attribute->getAttribute($product_attribute['attribute_id']);
+		foreach ($attribute_groups as $attribute_group) {
+			$attributes = $this->model_catalog_attribute->getAttributes(array(
+				'filter_attribute_group_id' => $attribute_group['attribute_group_id'],
+				'sort'                      => 'a.sort_order',
+				'order'                     => 'ASC'
+			));
 
-			if ($attribute_info) {
-				$data['product_attributes'][] = array(
-					'attribute_id'                  => $product_attribute['attribute_id'],
-					'name'                          => $attribute_info['name'],
-					'product_attribute_description' => $product_attribute['product_attribute_description']
+			if (!$attributes) {
+				continue;
+			}
+
+			$group_attributes = array();
+
+			foreach ($attributes as $attribute) {
+				$text_data = array();
+
+				foreach ($saved_attributes as $saved) {
+					if ($saved['attribute_id'] == $attribute['attribute_id']) {
+						$text_data = $saved['product_attribute_description'];
+						break;
+					}
+				}
+
+				$group_attributes[] = array(
+					'attribute_id' => $attribute['attribute_id'],
+					'name'         => $attribute['name'],
+					'text'         => $text_data
 				);
 			}
+
+			$data['attribute_groups'][] = array(
+				'name'      => $attribute_group['name'],
+				'attribute' => $group_attributes
+			);
 		}
 
 		// Options
diff --git a/public/admin/model/catalog/product.php b/public/admin/model/catalog/product.php
index 43d06d7..b802d9a 100644
--- a/public/admin/model/catalog/product.php
+++ b/public/admin/model/catalog/product.php
@@ -25,13 +25,12 @@ class ModelCatalogProduct extends Model {
 		if (isset($data['product_attribute'])) {
 			foreach ($data['product_attribute'] as $product_attribute) {
 				if ($product_attribute['attribute_id']) {
-					// Removes duplicates
-					$this->db->query("DELETE FROM " . DB_PREFIX . "product_attribute WHERE product_id = '" . (int)$product_id . "' AND attribute_id = '" . (int)$product_attribute['attribute_id'] . "'");
-
 					foreach ($product_attribute['product_attribute_description'] as $language_id => $product_attribute_description) {
-						$this->db->query("DELETE FROM " . DB_PREFIX . "product_attribute WHERE product_id = '" . (int)$product_id . "' AND attribute_id = '" . (int)$product_attribute['attribute_id'] . "' AND language_id = '" . (int)$language_id . "'");
+						if (!empty($product_attribute_description['text'])) {
+							$this->db->query("DELETE FROM " . DB_PREFIX . "product_attribute WHERE product_id = '" . (int)$product_id . "' AND attribute_id = '" . (int)$product_attribute['attribute_id'] . "' AND language_id = '" . (int)$language_id . "'");
 
-						$this->db->query("INSERT INTO " . DB_PREFIX . "product_attribute SET product_id = '" . (int)$product_id . "', attribute_id = '" . (int)$product_attribute['attribute_id'] . "', language_id = '" . (int)$language_id . "', text = '" .  $this->db->escape($product_attribute_description['text']) . "'");
+							$this->db->query("INSERT INTO " . DB_PREFIX . "product_attribute SET product_id = '" . (int)$product_id . "', attribute_id = '" . (int)$product_attribute['attribute_id'] . "', language_id = '" . (int)$language_id . "', text = '" .  $this->db->escape($product_attribute_description['text']) . "'");
+						}
 					}
 				}
 			}
@@ -186,11 +185,10 @@ class ModelCatalogProduct extends Model {
 		if (!empty($data['product_attribute'])) {
 			foreach ($data['product_attribute'] as $product_attribute) {
 				if ($product_attribute['attribute_id']) {
-					// Removes duplicates
-					$this->db->query("DELETE FROM " . DB_PREFIX . "product_attribute WHERE product_id = '" . (int)$product_id . "' AND attribute_id = '" . (int)$product_attribute['attribute_id'] . "'");
-
 					foreach ($product_attribute['product_attribute_description'] as $language_id => $product_attribute_description) {
-						$this->db->query("INSERT INTO " . DB_PREFIX . "product_attribute SET product_id = '" . (int)$product_id . "', attribute_id = '" . (int)$product_attribute['attribute_id'] . "', language_id = '" . (int)$language_id . "', text = '" .  $this->db->escape($product_attribute_description['text']) . "'");
+						if (!empty($product_attribute_description['text'])) {
+							$this->db->query("INSERT INTO " . DB_PREFIX . "product_attribute SET product_id = '" . (int)$product_id . "', attribute_id = '" . (int)$product_attribute['attribute_id'] . "', language_id = '" . (int)$language_id . "', text = '" .  $this->db->escape($product_attribute_description['text']) . "'");
+						}
 					}
 				}
 			}
diff --git a/public/admin/view/template/catalog/product_form.twig b/public/admin/view/template/catalog/product_form.twig
index dba6078..1582a2b 100644
--- a/public/admin/view/template/catalog/product_form.twig
+++ b/public/admin/view/template/catalog/product_form.twig
@@ -492,39 +492,26 @@
               </div>
             </div>
             <div class="tab-pane" id="tab-attribute">
-              <div class="table-responsive">
-                <table id="attribute" class="table table-striped table-bordered table-hover">
-                  <thead>
-                    <tr>
-                      <td class="text-left">{{ entry_attribute }}</td>
-                      <td class="text-left">{{ entry_text }}</td>
-                      <td></td>
-                    </tr>
-                  </thead>
-                  <tbody>
-
-                    {% set attribute_row = 0 %}
-                    {% for product_attribute in product_attributes %}
-                      <tr id="attribute-row{{ attribute_row }}">
-                        <td class="text-left" style="width: 40%;"><input type="text" name="product_attribute[{{ attribute_row }}][name]" value="{{ product_attribute.name }}" placeholder="{{ entry_attribute }}" class="form-control"/> <input type="hidden" name="product_attribute[{{ attribute_row }}][attribute_id]" value="{{ product_attribute.attribute_id }}"/></td>
-                        <td class="text-left">{% for language in languages %}
-                            <div class="input-group"><span class="input-group-addon"><img src="language/{{ language.code }}/{{ language.code }}.png" title="{{ language.name }}"/></span> <textarea name="product_attribute[{{ attribute_row }}][product_attribute_description][{{ language.language_id }}][text]" rows="5" placeholder="{{ entry_text }}" class="form-control">{{ product_attribute.product_attribute_description[language.language_id] ? product_attribute.product_attribute_description[language.language_id].text }}</textarea>
-                            </div>
-                          {% endfor %}</td>
-                        <td class="text-right"><button type="button" onclick="$('#attribute-row{{ attribute_row }}').remove();" data-toggle="tooltip" title="{{ button_remove }}" class="btn btn-danger"><i class="fa fa-minus-circle"></i></button></td>
-                      </tr>
-                      {% set attribute_row = attribute_row + 1 %}
-                    {% endfor %}
-                  </tbody>
-
-                  <tfoot>
-                    <tr>
-                      <td colspan="2"></td>
-                      <td class="text-right"><button type="button" onclick="addAttribute();" data-toggle="tooltip" title="{{ button_attribute_add }}" class="btn btn-primary"><i class="fa fa-plus-circle"></i></button></td>
-                    </tr>
-                  </tfoot>
-                </table>
+              {% for attribute_group in attribute_groups %}
+              <div class="panel panel-default">
+                <div class="panel-heading"><h4 class="panel-title">{{ attribute_group.name }}</h4></div>
+                <div class="panel-body">
+                  {% for attribute in attribute_group.attribute %}
+                  <div class="form-group">
+                    <label class="col-sm-2 control-label" for="input-attribute{{ attribute.attribute_id }}">{{ attribute.name }}</label>
+                    <div class="col-sm-10">
+                      <input type="hidden" name="product_attribute[{{ attribute.attribute_id }}][attribute_id]" value="{{ attribute.attribute_id }}"/>
+                      {% for language in languages %}
+                      <div class="input-group"><span class="input-group-addon"><img src="language/{{ language.code }}/{{ language.code }}.png" title="{{ language.name }}"/></span>
+                        <textarea name="product_attribute[{{ attribute.attribute_id }}][product_attribute_description][{{ language.language_id }}][text]" rows="3" class="form-control">{{ attribute.text[language.language_id] ? attribute.text[language.language_id].text }}</textarea>
+                      </div>
+                      {% endfor %}
+                    </div>
+                  </div>
+                  {% endfor %}
+                </div>
               </div>
+              {% endfor %}
             </div>
             
 
@@ -846,55 +833,6 @@ $('#article-related').delegate('.fa-minus-circle', 'click', function() {
 	$(this).parent().remove();
 });
 //--></script>
-  <script type="text/javascript"><!--
-  var attribute_row = {{ attribute_row }};
-
-  function addAttribute() {
-	  html = '<tr id="attribute-row' + attribute_row + '">';
-	  html += '  <td class="text-left" style="width: 20%;"><input type="text" name="product_attribute[' + attribute_row + '][name]" value="" placeholder="{{ entry_attribute }}" class="form-control" /><input type="hidden" name="product_attribute[' + attribute_row + '][attribute_id]" value="" /></td>';
-	  html += '  <td class="text-left">';
-    {% for language in languages %}
-	  html += '<div class="input-group"><span class="input-group-addon"><img src="language/{{ language.code }}/{{ language.code }}.png" title="{{ language.name }}" /></span><textarea name="product_attribute[' + attribute_row + '][product_attribute_description][{{ language.language_id }}][text]" rows="5" placeholder="{{ entry_text }}" class="form-control"></textarea></div>';
-    {% endfor %}
-	  html += '  </td>';
-	  html += '  <td class="text-right"><button type="button" onclick="$(\'#attribute-row' + attribute_row + '\').remove();" data-toggle="tooltip" title="{{ button_remove }}" class="btn btn-danger"><i class="fa fa-minus-circle"></i></button></td>';
-	  html += '</tr>';
-
-	  $('#attribute tbody').append(html);
-
-	  attributeautocomplete(attribute_row);
-
-	  attribute_row++;
-  }
-
-  function attributeautocomplete(attribute_row) {
-	  $('input[name=\'product_attribute[' + attribute_row + '][name]\']').autocomplete({
-		  'source': function(request, response) {
-			  $.ajax({
-				  url: 'index.php?route=catalog/attribute/autocomplete&user_token={{ user_token }}&filter_name=' + encodeURIComponent(request),
-				  dataType: 'json',
-				  success: function(json) {
-					  response($.map(json, function(item) {
-						  return {
-							  category: item.attribute_group,
-							  label: item.name,
-							  value: item.attribute_id
-						  }
-					  }));
-				  }
-			  });
-		  },
-		  'select': function(item) {
-			  $('input[name=\'product_attribute[' + attribute_row + '][name]\']').val(item['label']);
-			  $('input[name=\'product_attribute[' + attribute_row + '][attribute_id]\']').val(item['value']);
-		  }
-	  });
-  }
-
-  $('#attribute tbody tr').each(function(index, element) {
-	  attributeautocomplete(index);
-  });
-  //--></script>
   
   <script type="text/javascript"><!--
   var image_row = {{ image_row }};