diff --git a/sources/projectconfigpages.cpp b/sources/projectconfigpages.cpp
index b7736b458..80555075d 100644
--- a/sources/projectconfigpages.cpp
+++ b/sources/projectconfigpages.cpp
@@ -459,7 +459,6 @@ void ProjectAutoNumConfigPage::applyAutoNum() {
 		emit (saveCurrentTbp());
 		emit (setAutoNum(m_faw->autoNumSelected()));
 		while (foliosRemaining > 0){
-					qDebug() << foliosRemaining;
 			project()->autoFolioNumberingNewFolios();
 			foliosRemaining = foliosRemaining-1;
 		}
diff --git a/sources/qetgraphicsitem/qgraphicsitemutility.cpp b/sources/qetgraphicsitem/qgraphicsitemutility.cpp
index 1e6c2e362..a2fbe64a9 100644
--- a/sources/qetgraphicsitem/qgraphicsitemutility.cpp
+++ b/sources/qetgraphicsitem/qgraphicsitemutility.cpp
@@ -57,7 +57,7 @@ bool centerToBottomDiagram (QGraphicsItem *item_to_center, Element *element_to_f
 	QRectF  border = element_to_follow -> diagram() -> border_and_titleblock.insideBorderRect();
 	QPointF point  = element_to_follow -> sceneBoundingRect().center();
 
-	if (offset >= 50) //applies offset
+	if (offset >= 40) //applies offset
 	point.setY(border.bottom() - offset );
 	else //applies default
 	point.setY(border.bottom() - item_to_center -> boundingRect().height() - 5);
diff --git a/sources/ui/elementselectorwidget.cpp b/sources/ui/elementselectorwidget.cpp
index 53148124d..e95eaba7c 100644
--- a/sources/ui/elementselectorwidget.cpp
+++ b/sources/ui/elementselectorwidget.cpp
@@ -134,13 +134,13 @@ void ElementSelectorWidget::buildInterface() {
 			DiagramContext dc = elmt -> elementInformations();
 
 			if (!dc["label"].toString().isEmpty())
-				button_text = dc["label"].toString() + " ";
+				button_text = elmt->assignVariables(dc["label"].toString(), elmt) + " ";
 
 			if (!dc["comment"].toString().isEmpty())
-				button_text += dc["comment"].toString();
+				button_text += elmt->assignVariables(dc["comment"].toString(), elmt);
 
 			if (!dc["location"].toString().isEmpty())
-				button_text += dc["location"].toString();
+				button_text += elmt->assignVariables(dc["location"].toString(), elmt);
 
 			if (!button_text.isEmpty())
 				button_text += "\n";