Index: Vago/trunk/Vago/libs/LineNumberDisplay/LineNumberDisplay.cpp
===================================================================
--- Vago/trunk/Vago/libs/LineNumberDisplay/LineNumberDisplay.cpp	(revision 1058)
+++ Vago/trunk/Vago/libs/LineNumberDisplay/LineNumberDisplay.cpp	(revision 1059)
@@ -111,5 +111,5 @@
 
 	QFontMetrics fm(d_text_edit->currentFont(), this);
-	setMaximumWidth(2*fm.boundingRect(QString::number(lines)).width());
+    setMaximumWidth(2.5*fm.boundingRect(QString::number(lines)).width()); // 2.5 small fix to display numbers correctly on macos
 	verticalScrollBar()->setValue(d_text_edit->verticalScrollBar()->value());
 }
Index: Vago/trunk/Vago/soundWizard/soundpagefinal.cpp
===================================================================
--- Vago/trunk/Vago/soundWizard/soundpagefinal.cpp	(revision 1058)
+++ Vago/trunk/Vago/soundWizard/soundpagefinal.cpp	(revision 1059)
@@ -77,4 +77,9 @@
     bool priorityLowImp = false, priorityNormalImp = false,
             priorityHighImp = false, priorityHighestImp = false;
+
+    // Create temp folder if it doesn't exist
+    if(!QDir(GlobalVars::VagoTemporaryDir).exists()){
+        QDir().mkdir(GlobalVars::VagoTemporaryDir);
+    }
 
     // Get data page 2
Index: Vago/trunk/Vago/xmlToolsInterface/xmltoolsinterface.cpp
===================================================================
--- Vago/trunk/Vago/xmlToolsInterface/xmltoolsinterface.cpp	(revision 1058)
+++ Vago/trunk/Vago/xmlToolsInterface/xmltoolsinterface.cpp	(revision 1059)
@@ -155,4 +155,9 @@
     QFile oldFile(previewFileLocation);
 
+    // Create temp folder if it doesn't exist
+    if(!QDir(GlobalVars::VagoTemporaryDir).exists()){
+        QDir().mkdir(GlobalVars::VagoTemporaryDir);
+    }
+
     if(oldFile.exists()){
         if(!oldFile.remove()){
Index: Vago/trunk/Vago/xmlToolsInterface/xmltoolsinterface.ui
===================================================================
--- Vago/trunk/Vago/xmlToolsInterface/xmltoolsinterface.ui	(revision 1058)
+++ Vago/trunk/Vago/xmlToolsInterface/xmltoolsinterface.ui	(revision 1059)
@@ -7,12 +7,12 @@
     <x>0</x>
     <y>0</y>
-    <width>640</width>
-    <height>480</height>
+    <width>650</width>
+    <height>660</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
-    <width>640</width>
-    <height>480</height>
+    <width>650</width>
+    <height>660</height>
    </size>
   </property>
@@ -94,146 +94,101 @@
       <layout class="QVBoxLayout" name="verticalLayout_3">
        <item>
-        <layout class="QHBoxLayout" name="horizontalLayout_6">
+        <layout class="QVBoxLayout" name="verticalLayout">
          <item>
-          <widget class="QRadioButton" name="rbFilterRelativeElements">
-           <property name="minimumSize">
-            <size>
-             <width>110</width>
-             <height>0</height>
-            </size>
-           </property>
-           <property name="text">
-            <string>Relative Elements</string>
-           </property>
-           <property name="checked">
-            <bool>true</bool>
-           </property>
-          </widget>
+          <layout class="QHBoxLayout" name="horizontalLayout">
+           <item>
+            <widget class="QRadioButton" name="rbFilterRelativeElements">
+             <property name="minimumSize">
+              <size>
+               <width>140</width>
+               <height>0</height>
+              </size>
+             </property>
+             <property name="text">
+              <string>Relative Elements</string>
+             </property>
+             <property name="checked">
+              <bool>true</bool>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <layout class="QGridLayout" name="gridLayout">
+             <item row="0" column="0">
+              <widget class="QLabel" name="lbFilterElement">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="text">
+                <string>Element:</string>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="1">
+              <widget class="QLineEdit" name="leFilterElement"/>
+             </item>
+             <item row="0" column="2">
+              <widget class="QCheckBox" name="cbFilterParentElement">
+               <property name="text">
+                <string>Parent Element:</string>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="3">
+              <widget class="QLineEdit" name="leFilterParentElement"/>
+             </item>
+             <item row="1" column="0">
+              <widget class="QCheckBox" name="cbFilterAttributeName">
+               <property name="text">
+                <string>Attribute Name:</string>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="1">
+              <widget class="QLineEdit" name="leFilterAttributeName"/>
+             </item>
+             <item row="1" column="2">
+              <widget class="QLabel" name="lbFilterAttributeValue">
+               <property name="text">
+                <string>Attribute Value:</string>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="3">
+              <widget class="QLineEdit" name="leFilterAttributeValue">
+               <property name="minimumSize">
+                <size>
+                 <width>80</width>
+                 <height>0</height>
+                </size>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </item>
+          </layout>
          </item>
          <item>
-          <layout class="QVBoxLayout" name="verticalLayout">
+          <layout class="QHBoxLayout" name="horizontalLayout_2">
            <item>
-            <layout class="QHBoxLayout" name="horizontalLayout">
-             <item>
-              <layout class="QFormLayout" name="formLayout_2">
-               <item row="0" column="0">
-                <widget class="QLabel" name="lbFilterElement">
-                 <property name="minimumSize">
-                  <size>
-                   <width>102</width>
-                   <height>0</height>
-                  </size>
-                 </property>
-                 <property name="text">
-                  <string>Element:</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="1">
-                <widget class="QLineEdit" name="leFilterElement">
-                 <property name="minimumSize">
-                  <size>
-                   <width>120</width>
-                   <height>0</height>
-                  </size>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </item>
-             <item>
-              <layout class="QFormLayout" name="formLayout_7">
-               <item row="0" column="0">
-                <widget class="QCheckBox" name="cbFilterParentElement">
-                 <property name="minimumSize">
-                  <size>
-                   <width>100</width>
-                   <height>0</height>
-                  </size>
-                 </property>
-                 <property name="text">
-                  <string>Parent Element:</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="1">
-                <widget class="QLineEdit" name="leFilterParentElement"/>
-               </item>
-              </layout>
-             </item>
-            </layout>
+            <widget class="QRadioButton" name="rbFilterXPathExpression">
+             <property name="minimumSize">
+              <size>
+               <width>140</width>
+               <height>0</height>
+              </size>
+             </property>
+             <property name="text">
+              <string>X-Path Expression</string>
+             </property>
+            </widget>
            </item>
            <item>
-            <layout class="QHBoxLayout" name="horizontalLayout_2">
-             <item>
-              <layout class="QFormLayout" name="formLayout_4">
-               <item row="0" column="0">
-                <widget class="QCheckBox" name="cbFilterAttributeName">
-                 <property name="minimumSize">
-                  <size>
-                   <width>102</width>
-                   <height>0</height>
-                  </size>
-                 </property>
-                 <property name="text">
-                  <string>Attribute Name:</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="1">
-                <widget class="QLineEdit" name="leFilterAttributeName">
-                 <property name="minimumSize">
-                  <size>
-                   <width>120</width>
-                   <height>0</height>
-                  </size>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </item>
-             <item>
-              <layout class="QFormLayout" name="formLayout_3">
-               <item row="0" column="0">
-                <widget class="QLabel" name="lbFilterAttributeValue">
-                 <property name="minimumSize">
-                  <size>
-                   <width>100</width>
-                   <height>0</height>
-                  </size>
-                 </property>
-                 <property name="text">
-                  <string>Attribute Value:</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="1">
-                <widget class="QLineEdit" name="leFilterAttributeValue"/>
-               </item>
-              </layout>
-             </item>
-            </layout>
+            <widget class="QLineEdit" name="leFilterXPathExpression"/>
            </item>
           </layout>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <layout class="QFormLayout" name="formLayout">
-         <item row="0" column="0">
-          <widget class="QRadioButton" name="rbFilterXPathExpression">
-           <property name="minimumSize">
-            <size>
-             <width>110</width>
-             <height>0</height>
-            </size>
-           </property>
-           <property name="text">
-            <string>X-Path Expression</string>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="1">
-          <widget class="QLineEdit" name="leFilterXPathExpression"/>
          </item>
         </layout>
@@ -262,5 +217,5 @@
       <layout class="QVBoxLayout" name="verticalLayout_4">
        <item>
-        <layout class="QFormLayout" name="formLayout_6">
+        <layout class="QGridLayout" name="gridLayout_2">
          <item row="0" column="0">
           <widget class="QLabel" name="label_2">
@@ -271,10 +226,4 @@
             </sizepolicy>
            </property>
-           <property name="minimumSize">
-            <size>
-             <width>156</width>
-             <height>0</height>
-            </size>
-           </property>
            <property name="text">
             <string>Input File(s):</string>
@@ -283,9 +232,16 @@
          </item>
          <item row="0" column="1">
-          <layout class="QHBoxLayout" name="horizontalLayout_3">
-           <item>
-            <widget class="QLineEdit" name="leInputInputFiles"/>
-           </item>
-           <item>
+          <layout class="QGridLayout" name="gridLayout_3">
+           <item row="0" column="0">
+            <widget class="QLineEdit" name="leInputInputFiles">
+             <property name="minimumSize">
+              <size>
+               <width>200</width>
+               <height>0</height>
+              </size>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="1">
             <widget class="QPushButton" name="pbInputBrowse">
              <property name="text">
@@ -296,9 +252,5 @@
           </layout>
          </item>
-        </layout>
-       </item>
-       <item>
-        <layout class="QFormLayout" name="formLayout_8">
-         <item row="0" column="0">
+         <item row="1" column="0">
           <widget class="QLabel" name="lbInputCurrentValues">
            <property name="sizePolicy">
@@ -308,10 +260,4 @@
             </sizepolicy>
            </property>
-           <property name="minimumSize">
-            <size>
-             <width>156</width>
-             <height>0</height>
-            </size>
-           </property>
            <property name="text">
             <string>Current Value(s):</string>
@@ -319,5 +265,5 @@
           </widget>
          </item>
-         <item row="0" column="1">
+         <item row="1" column="1">
           <widget class="QLineEdit" name="leInputCurrentValues">
            <property name="text">
@@ -326,9 +272,5 @@
           </widget>
          </item>
-        </layout>
-       </item>
-       <item>
-        <layout class="QFormLayout" name="formLayout_9">
-         <item row="0" column="0">
+         <item row="2" column="0">
           <widget class="QLabel" name="lbInputNewValues">
            <property name="sizePolicy">
@@ -338,10 +280,4 @@
             </sizepolicy>
            </property>
-           <property name="minimumSize">
-            <size>
-             <width>156</width>
-             <height>0</height>
-            </size>
-           </property>
            <property name="text">
             <string>New Value(s):</string>
@@ -349,12 +285,8 @@
           </widget>
          </item>
-         <item row="0" column="1">
+         <item row="2" column="1">
           <widget class="QLineEdit" name="leInputNewValues"/>
          </item>
-        </layout>
-       </item>
-       <item>
-        <layout class="QFormLayout" name="formLayout_10">
-         <item row="0" column="0">
+         <item row="3" column="0">
           <widget class="QLabel" name="lbInputPositions">
            <property name="sizePolicy">
@@ -364,10 +296,4 @@
             </sizepolicy>
            </property>
-           <property name="minimumSize">
-            <size>
-             <width>156</width>
-             <height>0</height>
-            </size>
-           </property>
            <property name="text">
             <string>Position(s):</string>
@@ -375,5 +301,5 @@
           </widget>
          </item>
-         <item row="0" column="1">
+         <item row="3" column="1">
           <widget class="QLineEdit" name="leInputPositions">
            <property name="text">
@@ -382,9 +308,5 @@
           </widget>
          </item>
-        </layout>
-       </item>
-       <item>
-        <layout class="QFormLayout" name="formLayout_12">
-         <item row="0" column="0">
+         <item row="4" column="0">
           <widget class="QLabel" name="lbInputDiffOldNewValue">
            <property name="text">
@@ -393,5 +315,5 @@
           </widget>
          </item>
-         <item row="0" column="1">
+         <item row="4" column="1">
           <widget class="QLineEdit" name="leInputDiffOldNewValue"/>
          </item>
Index: Vago/trunk/Vago/xmlToolsInterface/xmltoolsinterfacecommandpreview.ui
===================================================================
--- Vago/trunk/Vago/xmlToolsInterface/xmltoolsinterfacecommandpreview.ui	(revision 1058)
+++ Vago/trunk/Vago/xmlToolsInterface/xmltoolsinterfacecommandpreview.ui	(revision 1059)
@@ -4,5 +4,5 @@
  <widget class="QMainWindow" name="XmlToolsInterfaceCommandPreview">
   <property name="windowModality">
-   <enum>Qt::WindowModal</enum>
+   <enum>Qt::ApplicationModal</enum>
   </property>
   <property name="geometry">
@@ -10,6 +10,6 @@
     <x>0</x>
     <y>0</y>
-    <width>560</width>
-    <height>400</height>
+    <width>600</width>
+    <height>480</height>
    </rect>
   </property>