diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py
index ab348ae471..7d3e851b70 100755
--- a/cura/CuraApplication.py
+++ b/cura/CuraApplication.py
@@ -1359,6 +1359,10 @@ class CuraApplication(QtApplication):
                     # Find node location
                     offset_shape_arr, hull_shape_arr = ShapeArray.fromNode(node, min_offset = min_offset)
 
+                    # If a model is to small then it will not contain any points
+                    if offset_shape_arr is None and hull_shape_arr is None:
+                        return
+
                     # Step is for skipping tests to make it a lot faster. it also makes the outcome somewhat rougher
                     node, _ = arranger.findNodePlacement(node, offset_shape_arr, hull_shape_arr, step = 10)
 
diff --git a/cura/ShapeArray.py b/cura/ShapeArray.py
index 95d0201c38..73fc2023e3 100755
--- a/cura/ShapeArray.py
+++ b/cura/ShapeArray.py
@@ -46,6 +46,10 @@ class ShapeArray:
         # For one_at_a_time printing you need the convex hull head.
         hull_head_verts = node.callDecoration("getConvexHullHead") or hull_verts
 
+        # If a model is to small then it will not contain any points
+        if not hull_verts.getPoints().any():
+            return None, None
+
         offset_verts = hull_head_verts.getMinkowskiHull(Polygon.approximatedCircle(min_offset))
         offset_points = copy.deepcopy(offset_verts._points)  # x, y
         offset_points[:, 0] = numpy.add(offset_points[:, 0], -transform_x)
diff --git a/resources/qml/Sidebar.qml b/resources/qml/Sidebar.qml
index 99948fc4fc..09e7551fa0 100755
--- a/resources/qml/Sidebar.qml
+++ b/resources/qml/Sidebar.qml
@@ -136,7 +136,7 @@ Rectangle
         anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width
         anchors.top:
         {
-            if (settingsModeLabel.contentWidth >= parent.width - width - UM.Theme.getSize("sidebar_margin").width)
+            if (settingsModeLabel.contentWidth >= parent.width - width - UM.Theme.getSize("sidebar_margin").width * 2)
             {
                 return settingsModeLabel.bottom;
             }
@@ -186,12 +186,18 @@ Rectangle
                                    UM.Theme.getColor("action_button")
                         Behavior on color { ColorAnimation { duration: 50; } }
                         Label {
-                            anchors.centerIn: parent
+                            anchors.left: parent.left
+                            anchors.right: parent.right
+                            anchors.verticalCenter: parent.verticalCenter
+                            anchors.leftMargin: UM.Theme.getSize("default_lining").width * 2
+                            anchors.rightMargin: UM.Theme.getSize("default_lining").width * 2
                             color: (control.checked || control.pressed) ? UM.Theme.getColor("action_button_active_text") :
                                        control.hovered ? UM.Theme.getColor("action_button_hovered_text") :
                                        UM.Theme.getColor("action_button_text")
                             font: UM.Theme.getFont("default")
-                            text: control.text;
+                            text: control.text
+                            horizontalAlignment: Text.AlignHCenter
+                            elide: Text.ElideMiddle
                         }
                     }
                     label: Item { }
diff --git a/resources/qml/SidebarSimple.qml b/resources/qml/SidebarSimple.qml
index ea9ee507ba..bd75a9a2de 100644
--- a/resources/qml/SidebarSimple.qml
+++ b/resources/qml/SidebarSimple.qml
@@ -316,10 +316,13 @@ Item
                     anchors.top: speedSlider.bottom
 
                     anchors.left: parent.left
+                    anchors.right: speedSlider.left
+                    anchors.rightMargin: UM.Theme.getSize("default_margin").width
 
                     text: catalog.i18nc("@label", "Print Speed")
                     font: UM.Theme.getFont("default")
                     color: UM.Theme.getColor("text")
+                    elide: Text.ElideRight
                 }
 
                 Label