diff --git a/sources/diagramfoliolist.cpp b/sources/diagramfoliolist.cpp
--- a/sources/diagramfoliolist.cpp
+++ b/sources/diagramfoliolist.cpp
@@ -18,8 +18,10 @@
 #include "diagramfoliolist.h"
 #include <QPainter>
 #include "qetapp.h"
+#include "nomenclature.h"
+#include "elementprovider.h"
 
-qreal DiagramFolioList::colWidths[8] = {0.05, 0.05, 0.45, 0.10, 0.10, 0.05, 0.10, 0.10};
+qreal DiagramFolioList::colWidths[8] = {0.10, 0.10, 0.45, 0.05, 0.05, 0.05, 0.10, 0.10};
 
 /**
  * @brief DiagramFolioList::DiagramFolioList
@@ -121,20 +123,20 @@
 	QFont workingFont(QETApp::diagramTextsFont());
 
 	// reduce the font size if the text entry is long
-	if (origFontMetrics.width(folio) > 0.95*colWidths[0]*row_rect.width())
-		workingFont.setPointSizeF(origFontSize * 0.95*colWidths[0]*row_rect.width() / origFontMetrics.width(folio));
+    if (origFontMetrics.width(machine) > 0.95*colWidths[0]*row_rect.width())
+        workingFont.setPointSizeF(origFontSize * 0.95*colWidths[0]*row_rect.width() / origFontMetrics.width(machine));
 	else
 		workingFont.setPointSizeF(origFontSize);
 	qp -> setFont(workingFont);
-	qp -> drawText(QRectF(x, y, colWidths[0]*row_rect.width(), row_rect.height()), Qt::AlignCenter, folio);
+    qp -> drawText(QRectF(x, y, colWidths[0]*row_rect.width(), row_rect.height()), Qt::AlignCenter, machine);
 	x += colWidths[0]*row_rect.width();
 
-	if (origFontMetrics.width(label) > 0.95*colWidths[1]*row_rect.width())
-		workingFont.setPointSizeF(origFontSize * 0.95*colWidths[1]*row_rect.width() / origFontMetrics.width(label));
+    if (origFontMetrics.width(loc) > 0.95*colWidths[1]*row_rect.width())
+        workingFont.setPointSizeF(origFontSize * 0.95*colWidths[1]*row_rect.width() / origFontMetrics.width(loc));
 	else
 		workingFont.setPointSizeF(origFontSize);
 	qp -> setFont(workingFont);
-	qp -> drawText(QRectF(x, y, colWidths[1]*row_rect.width(), row_rect.height()), Qt::AlignCenter, label);
+    qp -> drawText(QRectF(x, y, colWidths[1]*row_rect.width(), row_rect.height()), Qt::AlignCenter, loc);
 	x += colWidths[1]*row_rect.width();
 
 
@@ -152,21 +154,21 @@
 	x += colWidths[2]*row_rect.width();
 	
 	
-	if (origFontMetrics.width(machine) > 0.95*colWidths[3]*row_rect.width())
-		workingFont.setPointSizeF(origFontSize * 0.95*colWidths[3]*row_rect.width() / origFontMetrics.width(machine));
+    if (origFontMetrics.width(folio) > 0.95*colWidths[3]*row_rect.width())
+        workingFont.setPointSizeF(origFontSize * 0.95*colWidths[3]*row_rect.width() / origFontMetrics.width(folio));
 	else
 		workingFont.setPointSizeF(origFontSize);
 	qp -> setFont(workingFont);
-	qp -> drawText(QRectF(x, y, colWidths[3]*row_rect.width(), row_rect.height()), Qt::AlignCenter, machine);
+    qp -> drawText(QRectF(x, y, colWidths[3]*row_rect.width(), row_rect.height()), Qt::AlignCenter, folio);
 	x += colWidths[3]*row_rect.width();
 	
 	
-	if (origFontMetrics.width(loc) > 0.95*colWidths[4]*row_rect.width())
-		workingFont.setPointSizeF(origFontSize * 0.95*colWidths[4]*row_rect.width() / origFontMetrics.width(loc));
+    if (origFontMetrics.width(label) > 0.95*colWidths[4]*row_rect.width())
+        workingFont.setPointSizeF(origFontSize * 0.95*colWidths[4]*row_rect.width() / origFontMetrics.width(label));
 	else
 		workingFont.setPointSizeF(origFontSize);
 	qp -> setFont(workingFont);
-	qp -> drawText(QRectF(x, y, colWidths[4]*row_rect.width(), row_rect.height()), Qt::AlignCenter, loc);
+    qp -> drawText(QRectF(x, y, colWidths[4]*row_rect.width(), row_rect.height()), Qt::AlignCenter, label);
 	x += colWidths[4]*row_rect.width();