diff --git a/Wardrobe/GUI.vb b/Wardrobe/GUI.vb
index 0a4ecf4..db3eced 100644
--- a/Wardrobe/GUI.vb
+++ b/Wardrobe/GUI.vb
@@ -2,8 +2,8 @@
 Imports Excel = Microsoft.Office.Interop.Excel
 
 Public Class GUI
-    Public Shared filepath As String = "C:\Users\Anton\Documents\Exjobb"
-    'Public Shared filepath As String = "C:\Users\xperd\Documents"
+    'Public Shared filepath As String = "C:\Users\Anton\Documents\Exjobb"
+    Public Shared filepath As String = "C:\Users\xperd\Documents"
 
     Dim excelApp As Excel.Application = New Excel.Application
     Dim excelWB As Excel.Workbook
diff --git a/Wardrobe/GUI_Functions.vb b/Wardrobe/GUI_Functions.vb
index 9d27361..f560731 100644
--- a/Wardrobe/GUI_Functions.vb
+++ b/Wardrobe/GUI_Functions.vb
@@ -342,14 +342,49 @@
                     GUI_Drawing_Panel.sideSquareMesLine(mesName)(1) = GUI_Drawing_Panel.pCon2(1) + (sideSquareValues(2) + sideSquareValues(1)) / (GUI_Drawing_Panel.scaleDiff)
 
                     GUI_Drawing_Panel.measureLabels(mesName)(2) = (GUI_Drawing_Panel.sideSquareMesLine(mesName)(1) + GUI_Drawing_Panel.sideSquareMesLine(mesName)(3)) / 2 - 6
-
                 ElseIf GUI_Drawing_Panel.measureLabels(mesName)(3) = 3 Then
-                    'FIX
+                    GUI_Drawing_Panel.measureLabels(mesName)(0) = GUI_Drawing_Panel.points(GUI_Drawing_Panel.pointsOrder(index))(2) * 1000 -
+                            GUI_Drawing_Panel.pCon1(2) * 1000 - (sideSquareValues(2) + sideSquareValues(0))
+
+                    GUI_Drawing_Panel.sideSquareMesLine(mesName)(0) = GUI_Drawing_Panel.pCon1(0) + (sideSquareValues(2) + sideSquareValues(0)) / (GUI_Drawing_Panel.scaleDiff)
+
+                    GUI_Drawing_Panel.measureLabels(mesName)(1) = (GUI_Drawing_Panel.sideSquareMesLine(mesName)(0) + GUI_Drawing_Panel.sideSquareMesLine(mesName)(2)) / 2 - 8
+
                 Else
+                    'Fixa
+
+                    GUI_Drawing_Panel.measureLabels(mesName)(0) = GUI_Drawing_Panel.pCon2(3) * 1000 - GUI_Drawing_Panel.points(GUI_Drawing_Panel.pointsOrder(index + 1))(3) * 1000 -
+                         (sideSquareValues(2) + sideSquareValues(1))
+
+                    GUI_Drawing_Panel.sideSquareMesLine(mesName)(1) = GUI_Drawing_Panel.pCon2(1) + (sideSquareValues(2) + sideSquareValues(1)) / (GUI_Drawing_Panel.scaleDiff)
+
+                    GUI_Drawing_Panel.measureLabels(mesName)(2) = (GUI_Drawing_Panel.sideSquareMesLine(mesName)(1) + GUI_Drawing_Panel.sideSquareMesLine(mesName)(3)) / 2 - 6
+
 
                 End If
 
+            ElseIf mesName.Split("_")(0) = "SS1" AndAlso index + 1 = pointsMeasurements(mesName)(0) Then
+                If GUI_Drawing_Panel.measureLabels(mesName)(3) = 3 Then
+                    GUI_Drawing_Panel.measureLabels(mesName)(0) = GUI_Drawing_Panel.points(GUI_Drawing_Panel.pointsOrder(index))(2) * 1000 -
+                            GUI_Drawing_Panel.pCon1(2) * 1000 - (sideSquareValues(2) + sideSquareValues(0))
 
+                    GUI_Drawing_Panel.sideSquareMesLine(mesName)(0) = GUI_Drawing_Panel.pCon1(0) + (sideSquareValues(2) + sideSquareValues(0)) / (GUI_Drawing_Panel.scaleDiff)
+
+                    GUI_Drawing_Panel.measureLabels(mesName)(1) = (GUI_Drawing_Panel.sideSquareMesLine(mesName)(0) + GUI_Drawing_Panel.sideSquareMesLine(mesName)(2)) / 2 - 8
+
+                Else
+                    'Fixa
+
+                    GUI_Drawing_Panel.measureLabels(mesName)(0) = GUI_Drawing_Panel.pCon2(3) * 1000 - GUI_Drawing_Panel.points(GUI_Drawing_Panel.pointsOrder(index + 1))(3) * 1000 -
+                         (sideSquareValues(2) + sideSquareValues(1))
+
+                    GUI_Drawing_Panel.sideSquareMesLine(mesName)(1) = GUI_Drawing_Panel.pCon2(1) + (sideSquareValues(2) + sideSquareValues(1)) / (GUI_Drawing_Panel.scaleDiff)
+
+                    GUI_Drawing_Panel.measureLabels(mesName)(2) = (GUI_Drawing_Panel.sideSquareMesLine(mesName)(1) + GUI_Drawing_Panel.sideSquareMesLine(mesName)(3)) / 2 - 6
+
+
+
+                End If
             End If
         Next
 
@@ -492,9 +527,30 @@
                                          GUI_Drawing_Panel.pCon1(2) + sideSquareValues(2) / 1000,
                                         GUI_Drawing_Panel.pCon3(3)})
 
-            pointsMeasurements.Add("SS1_" & mesNum, {GUI_Drawing_Panel.pointsOrder.IndexOf(sidePoints(0)) + 1, index + 2, 3})
+            pointsMeasurements.Add("SS1_" & mesNum, {index + 5, GUI_Drawing_Panel.pointsOrder.IndexOf(sidePoints(sidePoints.Count - 1)) + 5, 3})
             pointsMeasurements.Add("SS_" & mesNum + 1, {index + 2, index + 5, 3})
             pointsMeasurements.Add("SS_" & mesNum + 2, {index + 2, index + 3, 4})
+
+            'Support Line for sidesquare measurement
+            GUI_Drawing_Panel.sideSquareMesLine.Add("SS1_" & mesNum, {GUI_Drawing_Panel.points(GUI_Drawing_Panel.pointsOrder(index + 1))(0),
+                                                     GUI_Drawing_Panel.pCon3(1) + 15,
+                                                    GUI_Drawing_Panel.pCon1(0) + sideSquareValues(2) / (GUI_Drawing_Panel.scaleDiff),
+                                                    GUI_Drawing_Panel.pCon3(1) + 15})
+
+            'Label
+            GUI_Drawing_Panel.measureLabels.Add("SS1_" & mesNum, {CInt(GUI.Controls("Off_TextBox").Text) - (GUI_Drawing_Panel.points(GUI_Drawing_Panel.pointsOrder(index + 1))(2) * 1000 + GUI_Gratings_Data.gratingMaxL / 2),
+                                                (GUI_Drawing_Panel.points(GUI_Drawing_Panel.pointsOrder(index + 1))(0) + GUI_Drawing_Panel.pCon1(0) + sideSquareValues(2) / (GUI_Drawing_Panel.scaleDiff)) / 2 - 8,
+                                                GUI_Drawing_Panel.pCon3(1) + 15 + 3,
+                                                3}) '15 är linjen, 12 är textens höjd, 3 är lite extra
+            GUI_Drawing_Panel.measureLabels.Add("SS_" & mesNum + 1, {CInt(GUI.Controls("X_TextBox").Text),
+                                                GUI_Drawing_Panel.pCon1(0) + sideSquareValues(2) / (GUI_Drawing_Panel.scaleDiff) + CInt(GUI.Controls("X_TextBox").Text) / (2 * GUI_Drawing_Panel.scaleDiff) - 8,
+                                                GUI_Drawing_Panel.pCon3(1) - sideSquareValues(1) / (GUI_Drawing_Panel.scaleDiff) - 12 - 3,
+                                                3})
+            GUI_Drawing_Panel.measureLabels.Add("SS_" & mesNum + 2, {CInt(GUI.Controls("Y_TextBox").Text),
+                                                GUI_Drawing_Panel.pCon1(0) + sideSquareValues(2) / (GUI_Drawing_Panel.scaleDiff) - 18 - 3,
+                                                GUI_Drawing_Panel.pCon3(1) - CInt(GUI.Controls("Y_TextBox").Text) / (2 * GUI_Drawing_Panel.scaleDiff) - 4,
+                                                3})
+
         Else
             GUI_Drawing_Panel.points.Add("pSS" & pointCounter * 4 - 3,
                                         {GUI_Drawing_Panel.pCon1(0),