diff --git a/sources/editor/ui/elementpropertieseditorwidget.cpp b/sources/editor/ui/elementpropertieseditorwidget.cpp
index 7c590040c..d69fe56a9 100644
--- a/sources/editor/ui/elementpropertieseditorwidget.cpp
+++ b/sources/editor/ui/elementpropertieseditorwidget.cpp
@@ -205,6 +205,8 @@ void ElementPropertiesEditorWidget::populateTree()
 					  QETInformation::translatedInfoKey(key));
 		qtwi->setData(0, Qt::UserRole, key);
 		qtwi->setText(1, m_data.m_informations.value(key).toString());
+		// Adjust column width
+		ui->m_tree->resizeColumnToContents(0);
 	}
 }
 
diff --git a/sources/qetinformation.cpp b/sources/qetinformation.cpp
index 6ff5fbbb5..361337fbf 100644
--- a/sources/qetinformation.cpp
+++ b/sources/qetinformation.cpp
@@ -312,6 +312,7 @@ QStringList QETInformation::elementEditorElementInfoKeys()
 {
 	QStringList list = { ELMT_LABEL,
 						 ELMT_PLANT,
+						 ELMT_LOCATION,
 						 ELMT_COMMENT,
 						 ELMT_FUNCTION,
 						 ELMT_DESCRIPTION,
@@ -322,8 +323,6 @@ QStringList QETInformation::elementEditorElementInfoKeys()
 						 ELMT_SUPPLIER,
 						 ELMT_QUANTITY,
 						 ELMT_UNITY,
-						 ELMT_LOCATION,
-						 ELMT_PLANT,
 						 ELMT_AUX1,
 						 ELMT_DESCRIPTION_AUX1,
 						 ELMT_DESIGNATION_AUX1,
diff --git a/sources/qetinformation.h b/sources/qetinformation.h
index 34946d639..c4c48e9f0 100644
--- a/sources/qetinformation.h
+++ b/sources/qetinformation.h
@@ -49,39 +49,39 @@ namespace QETInformation
 	static QString ELMT_LOCATION                     = "location";
 	static QString ELMT_AUX1                         = "auxiliary1";
 	static QString ELMT_DESCRIPTION_AUX1                 = "description_auxiliary1";
-	static QString ELMT_DESIGNATION_AUX1                  = "designation_auxiliary1 ";
+	static QString ELMT_DESIGNATION_AUX1                  = "designation_auxiliary1";
 	static QString ELMT_MANUFACTURER_AUX1                 = "manufacturer_auxiliary1";
 	static QString ELMT_MANUFACTURER_REF_AUX1             = "manufacturer_reference_auxiliary1";
-	static QString ELMT_MACHINE_MANUFACTURER_REF_AUX1     = "machine_manufacturer_reference_auxiliary1 ";
-	static QString ELMT_SUPPLIER_AUX1                     = "supplier_auxiliary1 ";
-	static QString ELMT_QUANTITY_AUX1                     = "quantity_auxiliary1 ";
+	static QString ELMT_MACHINE_MANUFACTURER_REF_AUX1     = "machine_manufacturer_reference_auxiliary1";
+	static QString ELMT_SUPPLIER_AUX1                     = "supplier_auxiliary1";
+	static QString ELMT_QUANTITY_AUX1                     = "quantity_auxiliary1";
 	static QString ELMT_UNITY_AUX1                        = "unity_auxiliary1";
 	static QString ELMT_AUX2                         = "auxiliary2";
 	static QString ELMT_DESCRIPTION_AUX2                 = "description_auxiliary2";
-	static QString ELMT_DESIGNATION_AUX2                  = "designation_auxiliary2 ";
+	static QString ELMT_DESIGNATION_AUX2                  = "designation_auxiliary2";
 	static QString ELMT_MANUFACTURER_AUX2                 = "manufacturer_auxiliary2";
 	static QString ELMT_MANUFACTURER_REF_AUX2             = "manufacturer_reference_auxiliary2";
 	static QString ELMT_MACHINE_MANUFACTURER_REF_AUX2     = "machine_manufacturer_reference_auxiliary2";
-	static QString ELMT_SUPPLIER_AUX2                     = "supplier_auxiliary2 ";
-	static QString ELMT_QUANTITY_AUX2                     = "quantity_auxiliary2 ";
+	static QString ELMT_SUPPLIER_AUX2                     = "supplier_auxiliary2";
+	static QString ELMT_QUANTITY_AUX2                     = "quantity_auxiliary2";
 	static QString ELMT_UNITY_AUX2                        = "unity_auxiliary2";
 	static QString ELMT_AUX3                         = "auxiliary3";
 	static QString ELMT_DESCRIPTION_AUX3                 = "description_auxiliary3";
-	static QString ELMT_DESIGNATION_AUX3                  = "designation_auxiliary3 ";
+	static QString ELMT_DESIGNATION_AUX3                  = "designation_auxiliary3";
 	static QString ELMT_MANUFACTURER_AUX3                 = "manufacturer_auxiliary3";
 	static QString ELMT_MANUFACTURER_REF_AUX3             = "manufacturer_reference_auxiliary3";
-	static QString ELMT_MACHINE_MANUFACTURER_REF_AUX3     = "machine_manufacturer_reference_auxiliary3 ";
-	static QString ELMT_SUPPLIER_AUX3                     = "supplier_auxiliary3 ";
-	static QString ELMT_QUANTITY_AUX3                     = "quantity_auxiliary3 ";
+	static QString ELMT_MACHINE_MANUFACTURER_REF_AUX3     = "machine_manufacturer_reference_auxiliary3";
+	static QString ELMT_SUPPLIER_AUX3                     = "supplier_auxiliary3";
+	static QString ELMT_QUANTITY_AUX3                     = "quantity_auxiliary3";
 	static QString ELMT_UNITY_AUX3                        = "unity_auxiliary3";
 	static QString ELMT_AUX4                         = "auxiliary4";
 	static QString ELMT_DESCRIPTION_AUX4                 = "description_auxiliary4";
-	static QString ELMT_DESIGNATION_AUX4                  = "designation_auxiliary4 ";
+	static QString ELMT_DESIGNATION_AUX4                  = "designation_auxiliary4";
 	static QString ELMT_MANUFACTURER_AUX4                 = "manufacturer_auxiliary4";
 	static QString ELMT_MANUFACTURER_REF_AUX4             = "manufacturer_reference_auxiliary4";
-	static QString ELMT_MACHINE_MANUFACTURER_REF_AUX4     = "machine_manufacturer_reference_auxiliary4 ";
-	static QString ELMT_SUPPLIER_AUX4                     = "supplier_auxiliary4 ";
-	static QString ELMT_QUANTITY_AUX4                     = "quantity_auxiliary4 ";
+	static QString ELMT_MACHINE_MANUFACTURER_REF_AUX4     = "machine_manufacturer_reference_auxiliary4";
+	static QString ELMT_SUPPLIER_AUX4                     = "supplier_auxiliary4";
+	static QString ELMT_QUANTITY_AUX4                     = "quantity_auxiliary4";
 	static QString ELMT_UNITY_AUX4                        = "unity_auxiliary4";