From: John Darrington <john@darrington.wattle.id.au>
Date: Tue, 22 Dec 2015 23:10:24 +0000 (+0100)
Subject: Whitespace changes only
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp;a=commitdiff_plain;h=03a7b96a587a58bda342b4eb5ce5f935880ba2b7

Whitespace changes only
---

diff --git a/src/ui/gui/data-editor.ui b/src/ui/gui/data-editor.ui
index 68712e1553..e5d8d7ae1f 100644
--- a/src/ui/gui/data-editor.ui
+++ b/src/ui/gui/data-editor.ui
@@ -12,21 +12,21 @@
         <child>
           <object class="GtkAction" id="new1">
             <property name="stock-id">file-new-data</property>
-	    <property name="label" translatable="yes">_New...</property>
+            <property name="label" translatable="yes">_New...</property>
             <property name="name">new1</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="file_new_syntax">
             <property name="name">file_new_syntax</property>
-	    <property name="stock-id">file-syntax-data</property>
+            <property name="stock-id">file-syntax-data</property>
             <property name="label" translatable="yes">_Syntax</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="file_new_data">
             <property name="name">file_new_data</property>
-	    <property name="stock-id">file-system-data</property>
+            <property name="stock-id">file-system-data</property>
             <property name="label" translatable="yes">_Data</property>
           </object>
         </child>
@@ -36,19 +36,19 @@
             <property name="name">file_open</property>
             <property name="label" translatable="yes">_Open...</property>
           </object>
-	  <accelerator key="O" modifiers="GDK_CONTROL_MASK"/>
+          <accelerator key="O" modifiers="GDK_CONTROL_MASK"/>
         </child>
         <child>
           <object class="GtkAction" id="file_import">
             <property name="name">file_import</property>
             <property name="label" translatable="yes">I_mport Data...</property>
-	    <property name="stock-id">file-import-data</property>
+            <property name="stock-id">file-import-data</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="rename_dataset">
             <property name="name">rename_dataset</property>
-	    <property name="label" translatable="yes">_Rename Dataset...</property>
+            <property name="label" translatable="yes">_Rename Dataset...</property>
             <property name="stock-id">file-rename-data-set</property>
           </object>
         </child>
@@ -56,9 +56,9 @@
           <object class="GtkAction" id="file_save">
             <property name="stock-id">file-save-data</property>
             <property name="name">file_save</property>
-	    <property name="label" translatable="yes">_Save</property>
+            <property name="label" translatable="yes">_Save</property>
           </object>
-	  <accelerator key="S" modifiers="GDK_CONTROL_MASK"/>
+          <accelerator key="S" modifiers="GDK_CONTROL_MASK"/>
         </child>
         <child>
           <object class="GtkAction" id="file_save_as">
@@ -66,7 +66,7 @@
             <property name="name">file_save_as</property>
             <property name="label" translatable="yes">Save _As...</property>
           </object>
-	  <accelerator key="S" modifiers="GDK_CONTROL_MASK | GDK_SHIFT_MASK"/>
+          <accelerator key="S" modifiers="GDK_CONTROL_MASK | GDK_SHIFT_MASK"/>
         </child>
         <child>
           <object class="GtkAction" id="file-information">
@@ -79,14 +79,14 @@
           <object class="GtkAction" id="file_information_working-file">
             <property name="name">file_information_working-file</property>
             <property name="label" translatable="yes">Working File</property>
-	    <property name="stock-id">display-information-working-file</property>
+            <property name="stock-id">display-information-working-file</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="file_information_external-file">
             <property name="name">file_information_external-file</property>
             <property name="label" translatable="yes">External File...</property>
-	    <property name="stock-id">display-information-external-file</property>
+            <property name="stock-id">display-information-external-file</property>
           </object>
         </child>
         <child>
@@ -146,8 +146,8 @@
           <object class="GtkToggleAction" id="view_value-labels">
             <property name="name">view_value-labels</property>
             <property name="label" translatable="yes">Value _Labels</property>
-	    <property name="tooltip" translatable="yes">Show/hide value labels</property>
-	    <property name="stock-id">view-value-labels</property>
+            <property name="tooltip" translatable="yes">Show/hide value labels</property>
+            <property name="stock-id">view-value-labels</property>
           </object>
         </child>
         <child>
@@ -160,7 +160,7 @@
           <object class="GtkRadioAction" id="view_variables">
             <property name="name">view_variables</property>
             <property name="label" translatable="yes">_Variables</property>
-	    <property name="group">view_data</property>
+            <property name="group">view_data</property>
           </object>
         </child>
         <child>
@@ -174,50 +174,50 @@
             <property name="label" translatable="yes">_Sort Cases...</property>
             <property name="name">data_sort-cases</property>
             <property name="manager">uimanager1</property>
-	    <property name="stock-id">data-sort-cases</property>
-	    <property name="tooltip" translatable="yes">Sort cases in the active dataset</property>
+            <property name="stock-id">data-sort-cases</property>
+            <property name="tooltip" translatable="yes">Sort cases in the active dataset</property>
           </object>
         </child>
         <child>
           <object class="PsppireDialogActionFlip" id="data_transpose">
-	    <property name="stock-id">data-transpose</property>
+            <property name="stock-id">data-transpose</property>
             <property name="name">data_transpose</property>
             <property name="manager">uimanager1</property>
             <property name="label" translatable="yes">_Transpose...</property>
-	    <property name="tooltip" translatable="yes">Transpose the cases with the variables</property>
+            <property name="tooltip" translatable="yes">Transpose the cases with the variables</property>
           </object>
         </child>
         <child>
           <object class="PsppireDialogActionAggregate" id="data_aggregate">
-	    <property name="stock-id">data-aggregate</property>
+            <property name="stock-id">data-aggregate</property>
             <property name="name">data_aggregate</property>
             <property name="manager">uimanager1</property>
             <property name="label" translatable="yes">_Aggregate...</property>
-	    <property name="tooltip" translatable="yes">Aggregate the case values into a new variable</property>
+            <property name="tooltip" translatable="yes">Aggregate the case values into a new variable</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="data_split-file">
             <property name="name">data_split-file</property>
             <property name="label" translatable="yes">S_plit File...</property>
-	    <property name="tooltip" translatable="yes">Split the active dataset</property>
-	    <property name="stock-id">data-split-file</property>
+            <property name="tooltip" translatable="yes">Split the active dataset</property>
+            <property name="stock-id">data-split-file</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="data_select-cases">
             <property name="name">data_select-cases</property>
             <property name="label" translatable="yes">Select _Cases...</property>
-	    <property name="tooltip" translatable="yes">Choose a subset of cases for analysis</property>
-	    <property name="stock-id">data-select-cases</property>
+            <property name="tooltip" translatable="yes">Choose a subset of cases for analysis</property>
+            <property name="stock-id">data-select-cases</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="data_weight-cases">
             <property name="name">data_weight-cases</property>
             <property name="label" translatable="yes">_Weight Cases...</property>
-	    <property name="tooltip" translatable="yes">Weight cases by variable</property>
-	    <property name="stock-id">data-weight-cases</property>
+            <property name="tooltip" translatable="yes">Weight cases by variable</property>
+            <property name="stock-id">data-weight-cases</property>
           </object>
         </child>
         <child>
@@ -231,7 +231,7 @@
             <property name="name">transform_compute</property>
             <property name="manager">uimanager1</property>
             <property name="label" translatable="yes">_Compute...</property>
-	    <property name="stock-id">transform-compute</property>
+            <property name="stock-id">transform-compute</property>
           </object>
         </child>
         <child>
@@ -239,7 +239,7 @@
             <property name="name">transform_count</property>
             <property name="manager">uimanager1</property>
             <property name="label" translatable="yes">Cou_nt...</property>
-	    <property name="stock-id">transform-count</property>
+            <property name="stock-id">transform-count</property>
           </object>
         </child>
         <child>
@@ -247,7 +247,7 @@
             <property name="name">transform_rank</property>
             <property name="manager">uimanager1</property>
             <property name="label" translatable="yes">Ran_k Cases...</property>
-	    <property name="stock-id">transform-rank-cases</property>
+            <property name="stock-id">transform-rank-cases</property>
           </object>
         </child>
         <child>
@@ -255,28 +255,28 @@
             <property name="name">transform_autorecode</property>
             <property name="manager">uimanager1</property>
             <property name="label" translatable="yes">Auto_matic Recode...</property>
-	    <property name="stock-id">transform-automatic-recode</property>
+            <property name="stock-id">transform-automatic-recode</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="transform_recode-same">
             <property name="name">transform_recode-same</property>
             <property name="label" translatable="yes">Recode into _Same Variables...</property>
-	    <property name="stock-id">transform-in-to-same-variables</property>
+            <property name="stock-id">transform-in-to-same-variables</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="transform_recode-different">
             <property name="name">transform_recode-different</property>
             <property name="label" translatable="yes">Recode into _Different Variables...</property>
-	    <property name="stock-id">transform-in-to-different-variables</property>
+            <property name="stock-id">transform-in-to-different-variables</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="transform_run-pending">
             <property name="name">transform_run-pending</property>
             <property name="label" translatable="yes">_Run Pending Transforms</property>
-	    <property name="stock-id">transform-run-pending</property>
+            <property name="stock-id">transform-run-pending</property>
           </object>
           <accelerator key="G" modifiers="GDK_CONTROL_MASK"/>
         </child>
@@ -290,7 +290,7 @@
           <object class="GtkAction" id="descriptive-statistics">
             <property name="name">descriptive-statistics</property>
             <property name="label" translatable="yes">_Descriptive Statistics</property>
-	    <property name="stock-id">analyze-descriptive-statistics</property>
+            <property name="stock-id">analyze-descriptive-statistics</property>
           </object>
         </child>
         <child>
@@ -325,7 +325,7 @@
           <object class="GtkAction" id="compare-means">
             <property name="name">compare-means</property>
             <property name="label" translatable="yes">Compare _Means</property>
-	    <property name="stock-id">analyze-compare-means</property>
+            <property name="stock-id">analyze-compare-means</property>
           </object>
         </child>
         <child>
@@ -368,7 +368,7 @@
             <property name="name">univariate</property>
             <property name="manager">uimanager1</property>
             <property name="label" translatable="yes">_Univariate Analysis...</property>
-	    <property name="stock-id">analyze-univariate-analysis</property>
+            <property name="stock-id">analyze-univariate-analysis</property>
             <property name="visible">False</property>
           </object>
         </child>
@@ -377,7 +377,7 @@
             <property name="name">correlation</property>
             <property name="manager">uimanager1</property>
             <property name="label" translatable="yes">Bivariate _Correlation...</property>
-	    <property name="stock-id">analyze-bivariate-correlation</property>
+            <property name="stock-id">analyze-bivariate-correlation</property>
           </object>
         </child>
         <child>
@@ -385,7 +385,7 @@
             <property name="name">k-means</property>
             <property name="manager">uimanager1</property>
             <property name="label" translatable="yes">_K-Means Cluster...</property>
-	    <property name="stock-id">analyze-kmeans-cluster</property>
+            <property name="stock-id">analyze-kmeans-cluster</property>
           </object>
         </child>
         <child>
@@ -393,7 +393,7 @@
             <property name="name">factor-analysis</property>
             <property name="manager">uimanager1</property>
             <property name="label" translatable="yes">Factor _Analysis...</property>
-	    <property name="stock-id">analyze-factor-analysis</property>
+            <property name="stock-id">analyze-factor-analysis</property>
           </object>
         </child>
         <child>
@@ -401,14 +401,14 @@
             <property name="name">reliability</property>
             <property name="manager">uimanager1</property>
             <property name="label" translatable="yes">Re_liability...</property>
-	    <property name="stock-id">analyze-realiability</property>
+            <property name="stock-id">analyze-realiability</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="regression">
             <property name="name">regression</property>
             <property name="label" translatable="yes">_Regression</property>
-	    <property name="stock-id">analyze-regression</property>
+            <property name="stock-id">analyze-regression</property>
           </object>
         </child>
         <child>
@@ -429,7 +429,7 @@
           <object class="GtkAction" id="non-parametrics">
             <property name="name">non-parametrics</property>
             <property name="label" translatable="yes">_Non-Parametric Statistics</property>
-	    <property name="stock-id">analyze-non-parametric-statistics</property>
+            <property name="stock-id">analyze-non-parametric-statistics</property>
           </object>
         </child>
         <child>
@@ -479,7 +479,7 @@
             <property name="name">roc-curve</property>
             <property name="manager">uimanager1</property>
             <property name="label" translatable="yes">ROC Cur_ve...</property>
-	    <property name="stock-id">analyze-roc-curve</property>
+            <property name="stock-id">analyze-roc-curve</property>
           </object>
         </child>
         <child>
@@ -493,7 +493,7 @@
             <property name="manager">uimanager1</property>
             <property name="name">graphs_scatterplot</property>
             <property name="label" translatable="yes">_Scatterplot</property>
-	    <property name="stock-id">graphs-scatterplot</property>
+            <property name="stock-id">graphs-scatterplot</property>
           </object>
         </child>
         <child>
@@ -501,7 +501,7 @@
             <property name="manager">uimanager1</property>
             <property name="name">graphs_histogram</property>
             <property name="label" translatable="yes">_Histogram</property>
-	    <property name="stock-id">graphs-histogram</property>
+            <property name="stock-id">graphs-histogram</property>
           </object>
         </child>
         <child>
@@ -509,7 +509,7 @@
             <property name="manager">uimanager1</property>
             <property name="name">graphs_barchart</property>
             <property name="label" translatable="yes">_Barchart</property>
-	    <property name="stock-id">graphs-barchart</property>
+            <property name="stock-id">graphs-barchart</property>
           </object>
         </child>
         <child>
@@ -523,15 +523,15 @@
             <property name="manager">uimanager1</property>
             <property name="name">utilities_variables</property>
             <property name="label" translatable="yes">_Variables...</property>
-	    <property name="tooltip" translatable="yes">Jump to variable</property>
-	    <property name="stock-id">utilities-variables</property>
+            <property name="tooltip" translatable="yes">Jump to variable</property>
+            <property name="stock-id">utilities-variables</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="utilities_comments">
             <property name="name">utilities_comments</property>
             <property name="label" translatable="yes">Data File _Comments...</property>
-	    <property name="stock-id">utilities-data-file-comments</property>
+            <property name="stock-id">utilities-data-file-comments</property>
           </object>
         </child>
         <child>
@@ -544,14 +544,14 @@
           <object class="GtkAction" id="windows_minimise_all">
             <property name="name">windows_minimise_all</property>
             <property name="label" translatable="yes">_Minimize All Windows</property>
-	    <property name="stock-id">windows-minimize-all</property>
+            <property name="stock-id">windows-minimize-all</property>
           </object>
         </child>
         <child>
           <object class="GtkToggleAction" id="windows_split">
             <property name="name">windows_split</property>
             <property name="label" translatable="yes">_Split</property>
-	    <property name="stock-id">windows-split</property>
+            <property name="stock-id">windows-split</property>
           </object>
         </child>
       </object>
@@ -580,8 +580,8 @@
           <separator/>
           <menuitem action="file_quit"/>
         </menu>
-	<placeholder name="DataSheetEditMenu"/>
-	<placeholder name="VarSheetEditMenu"/>
+        <placeholder name="DataSheetEditMenu"/>
+        <placeholder name="VarSheetEditMenu"/>
         <menu action="view">
           <menuitem action="view_statusbar"/>
           <separator/>
@@ -651,7 +651,7 @@
         <menu action="graphs">
           <menuitem action="graphs_scatterplot"/>
           <menuitem action="graphs_histogram"/>
-	  <menuitem action="graphs_barchart"/>
+          <menuitem action="graphs_barchart"/>
         </menu>
         <menu action="utilities">
           <menuitem action="utilities_variables"/>
@@ -663,17 +663,17 @@
         </menu>
       </menubar>
       <toolbar action="toolbar">
-	<toolitem name="toolbar_open" action="file_open"/>
-	<toolitem name="toolbar_save" action="file_save"/>
-	<separator/>
-	<placeholder name="DataSheetToolItems"/>
-	<placeholder name="VarSheetToolItems"/>
-	<separator/>
-	<toolitem name="toolbar_split-file" action="data_split-file"/>
-	<toolitem name="toolbar_weight-cases" action="data_weight-cases"/>
-	<toolitem name="toolbar_select-cases" action="data_select-cases"/>
-	<separator/>
-	<toolitem name="toolbar_select-cases" action="view_value-labels"/>
+        <toolitem name="toolbar_open" action="file_open"/>
+        <toolitem name="toolbar_save" action="file_save"/>
+        <separator/>
+        <placeholder name="DataSheetToolItems"/>
+        <placeholder name="VarSheetToolItems"/>
+        <separator/>
+        <toolitem name="toolbar_split-file" action="data_split-file"/>
+        <toolitem name="toolbar_weight-cases" action="data_weight-cases"/>
+        <toolitem name="toolbar_select-cases" action="data_select-cases"/>
+        <separator/>
+        <toolitem name="toolbar_select-cases" action="view_value-labels"/>
       </toolbar>
     </ui>
   </object>
@@ -682,11 +682,10 @@
   <object class="GtkMenuBar" constructor="uimanager1" id="menubar">
     <property name="visible">True</property>
   </object>
-      <object class="GtkToolbar" constructor="uimanager1" id="toolbar">
-        <property name="visible">True</property>
-        <property name="toolbar-style">GTK_TOOLBAR_ICONS</property>
-      </object>
-
+  <object class="GtkToolbar" constructor="uimanager1" id="toolbar">
+    <property name="visible">True</property>
+    <property name="toolbar-style">GTK_TOOLBAR_ICONS</property>
+  </object>
   <object class="GtkBox" id="status-bar">
     <property name="visible">True</property>
     <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
diff --git a/src/ui/gui/data-sheet.ui b/src/ui/gui/data-sheet.ui
index 72e3d6e476..83df966b23 100644
--- a/src/ui/gui/data-sheet.ui
+++ b/src/ui/gui/data-sheet.ui
@@ -3,44 +3,44 @@
   <object class="GtkUIManager" id="data_sheet_uim">
     <ui>
       <menubar name="menubar">
-	<placeholder name="DataSheetEditMenu">
-	  <menu name="edit" action="edit2">
-	    <menuitem action="edit_insert-variable"/>
-	    <menuitem action="edit_insert-case"/>
-	    <menuitem action="edit_goto-variable"/>
-	    <menuitem action="edit_goto-case"/>
-	    <separator/>
-	    <menuitem action="edit_cut"/>
-	    <menuitem action="edit_copy"/>
-	    <menuitem action="edit_paste"/>
-	    <menuitem action="edit_clear-variables"/>
-	    <menuitem action="edit_clear-cases"/>
-	    <separator/>
-	    <menuitem action="edit_find"/>
-	  </menu>
-	</placeholder>
+        <placeholder name="DataSheetEditMenu">
+          <menu name="edit" action="edit2">
+            <menuitem action="edit_insert-variable"/>
+            <menuitem action="edit_insert-case"/>
+            <menuitem action="edit_goto-variable"/>
+            <menuitem action="edit_goto-case"/>
+            <separator/>
+            <menuitem action="edit_cut"/>
+            <menuitem action="edit_copy"/>
+            <menuitem action="edit_paste"/>
+            <menuitem action="edit_clear-variables"/>
+            <menuitem action="edit_clear-cases"/>
+            <separator/>
+            <menuitem action="edit_find"/>
+          </menu>
+        </placeholder>
       </menubar>
       <toolbar name="toolbar">
-	<placeholder name="DataSheetToolItems">
-	  <toolitem name="toolbar_goto-variable" action="edit_goto-variable"/>
-	  <toolitem name="toolbar_goto-case" action="edit_goto-case"/>
-	  <toolitem name="toolbar_find" action="edit_find"/>
-	  <toolitem name="toolbar_insert-cases" action="edit_insert-case"/>
-	  <toolitem name="toolbar_insert-variable" action="edit_insert-variable"/>
-	</placeholder>
+        <placeholder name="DataSheetToolItems">
+          <toolitem name="toolbar_goto-variable" action="edit_goto-variable"/>
+          <toolitem name="toolbar_goto-case" action="edit_goto-case"/>
+          <toolitem name="toolbar_find" action="edit_find"/>
+          <toolitem name="toolbar_insert-cases" action="edit_insert-case"/>
+          <toolitem name="toolbar_insert-variable" action="edit_insert-variable"/>
+        </placeholder>
       </toolbar>
       <popup name="datasheet-variable-popup">
-	<menuitem action="edit_insert-variable"/>
-	<separator/>
-	<menuitem action="edit_clear-variables"/>
-	<separator/>
+        <menuitem action="edit_insert-variable"/>
+        <separator/>
+        <menuitem action="edit_clear-variables"/>
+        <separator/>
         <menuitem action="sort-up"/>
         <menuitem action="sort-down"/>
       </popup>
       <popup name="datasheet-cases-popup">
-	<menuitem action="edit_insert-case"/>
-	<separator/>
-	<menuitem action="edit_clear-cases"/>
+        <menuitem action="edit_insert-case"/>
+        <separator/>
+        <menuitem action="edit_clear-cases"/>
       </popup>
     </ui>
     <child>
@@ -56,7 +56,7 @@
             <property name="name">edit_insert-variable</property>
             <property name="label" translatable="yes">Insert Variable</property>
             <property name="tooltip" translatable="yes">Create a new variable at the current position</property>
-	    <property name="stock-id">edit-insert-variable</property>
+            <property name="stock-id">edit-insert-variable</property>
           </object>
         </child>
         <child>
@@ -64,15 +64,15 @@
             <property name="name">edit_insert-case</property>
             <property name="label" translatable="yes">Insert Case</property>
             <property name="tooltip" translatable="yes">Create a new case at the current position</property>
-	    <property name="stock-id">edit-insert-case</property>
+            <property name="stock-id">edit-insert-case</property>
           </object>
         </child>
         <child>
           <object class="PsppireDialogActionVarInfo" id="edit_goto-variable">
             <property name="name">edit_goto-variable</property>
             <property name="label" translatable="yes">Go To Variable...</property>
-	    <property name="tooltip" translatable="yes">Jump to variable</property>
-	    <property name="stock-id">edit-go-to-variable</property>
+            <property name="tooltip" translatable="yes">Jump to variable</property>
+            <property name="stock-id">edit-go-to-variable</property>
           </object>
         </child>
         <child>
@@ -80,8 +80,7 @@
             <property name="label" translatable="yes">Go To Case...</property>
             <property name="name">edit_goto-case</property>
             <property name="tooltip" translatable="yes">Jump to a case in the data sheet</property>
-	    <property name="stock-id">edit-go-to-case</property>
-
+            <property name="stock-id">edit-go-to-case</property>
           </object>
         </child>
         <child>
@@ -106,7 +105,7 @@
           <object class="GtkAction" id="edit_clear-variables">
             <property name="name">edit_clear-variables</property>
             <property name="label" translatable="yes">Cl_ear Variables</property>
-	    <property name="tooltip" translatable="yes">Delete the variables at the selected position(s)</property>
+            <property name="tooltip" translatable="yes">Delete the variables at the selected position(s)</property>
             <property name="stock-id">edit-clear</property>
           </object>
         </child>
@@ -128,14 +127,14 @@
         <child>
           <object class="GtkAction" id="sort-up">
             <property name="stock-id">data-sort-ascending</property>
-	    <property name="name">sort_ascending</property>
+            <property name="name">sort_ascending</property>
             <property name="label" translatable="yes">Sort _Ascending</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="sort-down">
             <property name="stock-id">data-sort-descending</property>
-	    <property name="name">sort_descending</property>
+            <property name="name">sort_descending</property>
             <property name="label" translatable="yes">Sort _Descending</property>
           </object>
         </child>
diff --git a/src/ui/gui/examine.ui b/src/ui/gui/examine.ui
index 89f50723f1..75ec3d2672 100644
--- a/src/ui/gui/examine.ui
+++ b/src/ui/gui/examine.ui
@@ -38,12 +38,12 @@
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
-                          <object class="GtkEntry" id="entry1">
-			    <property name="margin-start">12</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                          </object>
+                      <object class="GtkEntry" id="entry1">
+                        <property name="margin-start">12</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                      </object>
                     </child>
                     <child type="label">
                       <object class="GtkLabel" id="label3">
@@ -71,23 +71,23 @@
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
-                          <object class="GtkScrolledWindow" id="scrolledwindow3">
+                      <object class="GtkScrolledWindow" id="scrolledwindow3">
+                        <property name="visible">True</property>
+                        <property name="margin-left">12</property>
+                        <property name="can_focus">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="hscrollbar_policy">never</property>
+                        <property name="shadow_type">etched-in</property>
+                        <child>
+                          <object class="PsppireVarView" id="treeview3">
                             <property name="visible">True</property>
-                            <property name="margin-left">12</property>
                             <property name="can_focus">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="hscrollbar_policy">never</property>
-                            <property name="shadow_type">etched-in</property>
-                            <child>
-                              <object class="PsppireVarView" id="treeview3">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="border_width">0</property>
-                                <property name="headers_visible">False</property>
-                                <child internal-child="selection">
-                                  <object class="GtkTreeSelection" id="psppire-var-view-selection1"/>
-                                </child>
+                            <property name="border_width">0</property>
+                            <property name="headers_visible">False</property>
+                            <child internal-child="selection">
+                              <object class="GtkTreeSelection" id="psppire-var-view-selection1"/>
+                            </child>
                           </object>
                         </child>
                       </object>
@@ -118,23 +118,23 @@
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
-                          <object class="GtkScrolledWindow" id="scrolledwindow2">
+                      <object class="GtkScrolledWindow" id="scrolledwindow2">
+                        <property name="visible">True</property>
+                        <property name="margin-left">12</property>
+                        <property name="can_focus">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="hscrollbar_policy">never</property>
+                        <property name="shadow_type">etched-in</property>
+                        <child>
+                          <object class="PsppireVarView" id="treeview2">
                             <property name="visible">True</property>
-                            <property name="margin-left">12</property>
                             <property name="can_focus">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="hscrollbar_policy">never</property>
-                            <property name="shadow_type">etched-in</property>
-                            <child>
-                              <object class="PsppireVarView" id="treeview2">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="border_width">0</property>
-                                <property name="headers_visible">False</property>
-                                <child internal-child="selection">
-                                  <object class="GtkTreeSelection" id="psppire-var-view-selection2"/>
-                                </child>
+                            <property name="border_width">0</property>
+                            <property name="headers_visible">False</property>
+                            <child internal-child="selection">
+                              <object class="GtkTreeSelection" id="psppire-var-view-selection2"/>
+                            </child>
                           </object>
                         </child>
                       </object>
@@ -326,68 +326,68 @@
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <property name="label_xalign">0</property>
             <child>
-                  <object class="GtkBox" id="vbox4">
+              <object class="GtkBox" id="vbox4">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="margin-start">12</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkRadioButton" id="radiobutton1">
+                    <property name="label" translatable="yes">Exclude cases _listwise</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="margin-start">12</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="orientation">vertical</property>
-                    <child>
-                      <object class="GtkRadioButton" id="radiobutton1">
-                        <property name="label" translatable="yes">Exclude cases _listwise</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="use_underline">True</property>
-                        <property name="xalign">0.5</property>
-                        <property name="active">True</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkRadioButton" id="radiobutton2">
-                        <property name="label" translatable="yes">Exclude cases _pairwise</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="use_underline">True</property>
-                        <property name="xalign">0.5</property>
-                        <property name="active">True</property>
-                        <property name="draw_indicator">True</property>
-                        <property name="group">radiobutton1</property>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkRadioButton" id="radiobutton3">
-                        <property name="label" translatable="yes">_Report values</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="use_underline">True</property>
-                        <property name="xalign">0.5</property>
-                        <property name="active">True</property>
-                        <property name="draw_indicator">True</property>
-                        <property name="group">radiobutton1</property>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0.5</property>
+                    <property name="active">True</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkRadioButton" id="radiobutton2">
+                    <property name="label" translatable="yes">Exclude cases _pairwise</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0.5</property>
+                    <property name="active">True</property>
+                    <property name="draw_indicator">True</property>
+                    <property name="group">radiobutton1</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkRadioButton" id="radiobutton3">
+                    <property name="label" translatable="yes">_Report values</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0.5</property>
+                    <property name="active">True</property>
+                    <property name="draw_indicator">True</property>
+                    <property name="group">radiobutton1</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
               </object>
             </child>
             <child type="label">
diff --git a/src/ui/gui/means.ui b/src/ui/gui/means.ui
index 38166a17b0..fefb42b869 100644
--- a/src/ui/gui/means.ui
+++ b/src/ui/gui/means.ui
@@ -16,174 +16,174 @@
         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
         <property name="spacing">2</property>
         <child>
-              <object class="GtkBox" id="hbox24">
+          <object class="GtkBox" id="hbox24">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+            <child>
+              <object class="GtkScrolledWindow" id="scrolledwindow16">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can_focus">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="hscrollbar_policy">never</property>
+                <property name="shadow_type">etched-in</property>
                 <child>
-                  <object class="GtkScrolledWindow" id="scrolledwindow16">
+                  <object class="PsppireDictView" id="all-variables">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="hscrollbar_policy">never</property>
-                    <property name="shadow_type">etched-in</property>
+                    <property name="border_width">0</property>
+                    <property name="headers_visible">False</property>
+                    <property name="headers_clickable">False</property>
+                    <child internal-child="selection">
+                      <object class="GtkTreeSelection" id="psppire-dictview-selection1"/>
+                    </child>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkPaned" id="vpaned1">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkBox" id="hbox1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <child>
-                      <object class="PsppireDictView" id="all-variables">
+                      <object class="PsppireSelector" id="stat-var-selector">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="border_width">0</property>
-                        <property name="headers_visible">False</property>
-                        <property name="headers_clickable">False</property>
-                        <child internal-child="selection">
-                          <object class="GtkTreeSelection" id="psppire-dictview-selection1"/>
-                        </child>
+                        <property name="halign">center</property>
+                        <property name="valign">center</property>
+                        <property name="border_width">5</property>
+                        <property name="source_widget">all-variables</property>
+                        <property name="dest_widget">stat-variables</property>
                       </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
                     </child>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkPaned" id="vpaned1">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="orientation">vertical</property>
                     <child>
-                      <object class="GtkBox" id="hbox1">
+                      <object class="GtkFrame" id="frame1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="label_xalign">0</property>
+                        <property name="shadow_type">none</property>
                         <child>
-                          <object class="PsppireSelector" id="stat-var-selector">
+                          <object class="GtkScrolledWindow" id="scrolledwindow17">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
+                            <property name="margin-start">12</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="halign">center</property>
-                            <property name="valign">center</property>
-                            <property name="border_width">5</property>
-                            <property name="source_widget">all-variables</property>
-                            <property name="dest_widget">stat-variables</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkFrame" id="frame1">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label_xalign">0</property>
-                            <property name="shadow_type">none</property>
+                            <property name="hscrollbar_policy">never</property>
+                            <property name="shadow_type">etched-in</property>
                             <child>
-                                  <object class="GtkScrolledWindow" id="scrolledwindow17">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="margin-start">12</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="hscrollbar_policy">never</property>
-                                    <property name="shadow_type">etched-in</property>
-                                    <child>
-                                      <object class="PsppireVarView" id="stat-variables">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                        <property name="border_width">0</property>
-                                        <property name="headers_visible">False</property>
-                                        <property name="headers_clickable">False</property>
-                                        <child internal-child="selection">
-                                          <object class="GtkTreeSelection" id="psppire-var-view-selection1"/>
-                                        </child>
-                                      </object>
-                                </child>
-                              </object>
-                            </child>
-                            <child type="label">
-                              <object class="GtkLabel" id="label1">
+                              <object class="PsppireVarView" id="stat-variables">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">_Dependent List:</property>
-                                <property name="use_markup">True</property>
-                                <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">stat-variables</property>
+                                <property name="can_focus">True</property>
+                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <property name="border_width">0</property>
+                                <property name="headers_visible">False</property>
+                                <property name="headers_clickable">False</property>
+                                <child internal-child="selection">
+                                  <object class="GtkTreeSelection" id="psppire-var-view-selection1"/>
+                                </child>
                               </object>
                             </child>
                           </object>
-                          <packing>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
                         </child>
+                        <child type="label">
+                          <object class="GtkLabel" id="label1">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">_Dependent List:</property>
+                            <property name="use_markup">True</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">stat-variables</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="resize">False</property>
+                    <property name="shrink">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox" id="hbox2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="PsppireSelector" id="layer-selector">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="halign">center</property>
+                        <property name="valign">center</property>
+                        <property name="border_width">5</property>
+                        <property name="source_widget">all-variables</property>
                       </object>
                       <packing>
-                        <property name="resize">False</property>
-                        <property name="shrink">True</property>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkBox" id="hbox2">
+                      <object class="GtkFrame" id="frame2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="label_xalign">0</property>
+                        <property name="shadow_type">none</property>
                         <child>
-                          <object class="PsppireSelector" id="layer-selector">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="halign">center</property>
-                            <property name="valign">center</property>
-                            <property name="border_width">5</property>
-                            <property name="source_widget">all-variables</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
+                          <placeholder/>
                         </child>
-                        <child>
-                          <object class="GtkFrame" id="frame2">
+                        <child type="label">
+                          <object class="GtkLabel" id="label2">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label_xalign">0</property>
-                            <property name="shadow_type">none</property>
-                            <child>
-                                  <placeholder/>
-                            </child>
-                            <child type="label">
-                              <object class="GtkLabel" id="label2">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">_Independent List:</property>
-                                <property name="use_underline">True</property>
-                              </object>
-                            </child>
+                            <property name="label" translatable="yes">_Independent List:</property>
+                            <property name="use_underline">True</property>
                           </object>
-                          <packing>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
                         </child>
                       </object>
                       <packing>
-                        <property name="resize">True</property>
-                        <property name="shrink">True</property>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
+                    <property name="resize">True</property>
+                    <property name="shrink">True</property>
                   </packing>
                 </child>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
           </object>
           <packing>
             <property name="expand">True</property>
diff --git a/src/ui/gui/output-window.ui b/src/ui/gui/output-window.ui
index 3c9686d566..a8aa42db42 100644
--- a/src/ui/gui/output-window.ui
+++ b/src/ui/gui/output-window.ui
@@ -15,7 +15,7 @@
             <property name="stock-id">file-print</property>
             <property name="label" translatable="yes">_Print...</property>
           </object>
-	  <accelerator key="P" modifiers="GDK_CONTROL_MASK"/>
+          <accelerator key="P" modifiers="GDK_CONTROL_MASK"/>
         </child>
         <child>
           <object class="GtkAction" id="file_export">
@@ -34,14 +34,14 @@
           <object class="GtkAction" id="edit_select-all">
             <property name="name">edit_select-all</property>
             <property name="stock-id">edit-select-all</property>
-	    <property name="label" translatable="yes">Select _All</property>
+            <property name="label" translatable="yes">Select _All</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="edit_copy">
             <property name="stock-id">edit-copy</property>
             <property name="name">edit_copy</property>
-	    <property name="label" translatable="yes">_Copy</property>
+            <property name="label" translatable="yes">_Copy</property>
           </object>
         </child>
         <child>
@@ -52,7 +52,7 @@
         </child>
         <child>
           <object class="GtkAction" id="windows_minimise-all">
-	    <property name="stock-id">windows-minimize-all</property>
+            <property name="stock-id">windows-minimize-all</property>
             <property name="name">windows_minimise-all</property>
             <property name="label" translatable="yes">_Minimize All Windows</property>
           </object>
@@ -77,71 +77,71 @@
   </object>
   <!-- interface-requires gtk+ 2.16 -->
   <!-- interface-naming-policy toplevel-contextual -->
-      <object class="GtkBox" id="box1">
+  <object class="GtkBox" id="box1">
+    <property name="visible">True</property>
+    <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
+    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+    <child>
+      <object class="GtkMenuBar" constructor="uimanager1" id="menubar">
         <property name="visible">True</property>
-	<property name="orientation">GTK_ORIENTATION_VERTICAL</property>
         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="position">0</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkPaned" id="paned1">
+        <property name="visible">True</property>
+        <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
+        <property name="can_focus">True</property>
+        <property name="position">112</property>
+        <property name="position_set">True</property>
         <child>
-          <object class="GtkMenuBar" constructor="uimanager1" id="menubar">
+          <object class="GtkScrolledWindow" id="scrolledwindow2">
             <property name="visible">True</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+            <property name="can_focus">True</property>
+            <property name="hscrollbar_policy">automatic</property>
+            <property name="vscrollbar_policy">automatic</property>
+            <child>
+              <object class="GtkTreeView" id="overview">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="headers_visible">False</property>
+              </object>
+            </child>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="position">0</property>
+            <property name="resize">False</property>
+            <property name="shrink">True</property>
           </packing>
         </child>
         <child>
-          <object class="GtkPaned" id="paned1">
+          <object class="GtkScrolledWindow" id="scrolledwindow1">
             <property name="visible">True</property>
-	    <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
             <property name="can_focus">True</property>
-            <property name="position">112</property>
-            <property name="position_set">True</property>
-            <child>
-              <object class="GtkScrolledWindow" id="scrolledwindow2">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="hscrollbar_policy">automatic</property>
-                <property name="vscrollbar_policy">automatic</property>
-                <child>
-                  <object class="GtkTreeView" id="overview">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="headers_visible">False</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="resize">False</property>
-                <property name="shrink">True</property>
-              </packing>
-            </child>
+            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+            <property name="hscrollbar_policy">automatic</property>
+            <property name="vscrollbar_policy">automatic</property>
             <child>
-              <object class="GtkScrolledWindow" id="scrolledwindow1">
+              <object class="GtkLayout" id="output">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="border-width">5</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="hscrollbar_policy">automatic</property>
-                <property name="vscrollbar_policy">automatic</property>
-                <child>
-                  <object class="GtkLayout" id="output">
-                    <property name="visible">True</property>
-		    <property name="border-width">5</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                  </object>
-                </child>
               </object>
-              <packing>
-                <property name="resize">True</property>
-                <property name="shrink">True</property>
-              </packing>
             </child>
           </object>
           <packing>
-            <property name="position">1</property>
-	    <property name="expand">True</property>
+            <property name="resize">True</property>
+            <property name="shrink">True</property>
           </packing>
         </child>
       </object>
+      <packing>
+        <property name="position">1</property>
+        <property name="expand">True</property>
+      </packing>
+    </child>
+  </object>
 </interface>
diff --git a/src/ui/gui/regression.ui b/src/ui/gui/regression.ui
index b5fa980b0f..d907a93067 100644
--- a/src/ui/gui/regression.ui
+++ b/src/ui/gui/regression.ui
@@ -15,103 +15,139 @@
         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
         <property name="spacing">2</property>
         <child>
-              <object class="GtkGrid" id="table1">
+          <object class="GtkGrid" id="table1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+            <property name="margin_left">5</property>
+            <property name="margin_right">5</property>
+            <property name="margin_top">5</property>
+            <property name="margin_bottom">5</property>
+            <property name="row_spacing">5</property>
+            <child>
+              <object class="GtkButtonBox" id="hbuttonbox1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="margin_left">5</property>
-                <property name="margin_right">5</property>
-                <property name="margin_top">5</property>
-                <property name="margin_bottom">5</property>
-                <property name="row_spacing">5</property>
+                <property name="layout_style">spread</property>
                 <child>
-                  <object class="GtkButtonBox" id="hbuttonbox1">
+                  <object class="GtkButton" id="stat-button">
+                    <property name="label" translatable="yes">S_tatistics...</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="layout_style">spread</property>
-                    <child>
-                      <object class="GtkButton" id="stat-button">
-                        <property name="label" translatable="yes">S_tatistics...</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="use_underline">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="save-button">
-                        <property name="label" translatable="yes">_Save...</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="use_underline">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
+                    <property name="use_underline">True</property>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">2</property>
-                    <property name="width">3</property>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="PsppireSelector" id="dep-selector">
+                  <object class="GtkButton" id="save-button">
+                    <property name="label" translatable="yes">_Save...</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="no_show_all">True</property>
-                    <property name="valign">center</property>
-                    <property name="border_width">5</property>
-                    <property name="source_widget">dict-view</property>
-                    <property name="dest_widget">dep-view</property>
+                    <property name="use_underline">True</property>
                   </object>
                   <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">0</property>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
                   </packing>
                 </child>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">2</property>
+                <property name="width">3</property>
+              </packing>
+            </child>
+            <child>
+              <object class="PsppireSelector" id="dep-selector">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="no_show_all">True</property>
+                <property name="valign">center</property>
+                <property name="border_width">5</property>
+                <property name="source_widget">dict-view</property>
+                <property name="dest_widget">dep-view</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="PsppireSelector" id="indep-selector">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="no_show_all">True</property>
+                <property name="valign">center</property>
+                <property name="border_width">5</property>
+                <property name="source_widget">dict-view</property>
+                <property name="dest_widget">indep-view</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkScrolledWindow" id="variables">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
+                <property name="hscrollbar_policy">never</property>
+                <property name="shadow_type">etched-in</property>
                 <child>
-                  <object class="PsppireSelector" id="indep-selector">
+                  <object class="PsppireDictView" id="dict-view">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="no_show_all">True</property>
-                    <property name="valign">center</property>
-                    <property name="border_width">5</property>
-                    <property name="source_widget">dict-view</property>
-                    <property name="dest_widget">indep-view</property>
+                    <property name="border_width">0</property>
+                    <property name="headers_visible">False</property>
+                    <property name="headers_clickable">False</property>
+                    <child internal-child="selection">
+                      <object class="GtkTreeSelection" id="psppire-dictview-selection1"/>
+                    </child>
                   </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">1</property>
-                  </packing>
                 </child>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
+                <property name="height">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkFrame" id="frame2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="hexpand">True</property>
+                <property name="label_xalign">0</property>
+                <property name="shadow_type">none</property>
                 <child>
-                  <object class="GtkScrolledWindow" id="variables">
+                  <object class="GtkScrolledWindow" id="scrolledwindow1">
+                    <property name="margin-start">12</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="hexpand">True</property>
-                    <property name="vexpand">True</property>
                     <property name="hscrollbar_policy">never</property>
                     <property name="shadow_type">etched-in</property>
                     <child>
-                      <object class="PsppireDictView" id="dict-view">
+                      <object class="PsppireVarView" id="dep-view">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -119,111 +155,75 @@
                         <property name="headers_visible">False</property>
                         <property name="headers_clickable">False</property>
                         <child internal-child="selection">
-                          <object class="GtkTreeSelection" id="psppire-dictview-selection1"/>
+                          <object class="GtkTreeSelection" id="psppire-var-view-selection1"/>
                         </child>
                       </object>
                     </child>
                   </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
-                    <property name="height">2</property>
-                  </packing>
                 </child>
-                <child>
-                  <object class="GtkFrame" id="frame2">
+                <child type="label">
+                  <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="hexpand">True</property>
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">none</property>
-                    <child>
-                          <object class="GtkScrolledWindow" id="scrolledwindow1">
-			    <property name="margin-start">12</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="hscrollbar_policy">never</property>
-                            <property name="shadow_type">etched-in</property>
-                            <child>
-                              <object class="PsppireVarView" id="dep-view">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="border_width">0</property>
-                                <property name="headers_visible">False</property>
-                                <property name="headers_clickable">False</property>
-                                <child internal-child="selection">
-                                  <object class="GtkTreeSelection" id="psppire-var-view-selection1"/>
-                                </child>
-                              </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child type="label">
-                      <object class="GtkLabel" id="label1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label" translatable="yes">_Dependent</property>
-                        <property name="use_markup">True</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">dep-view</property>
-                      </object>
-                    </child>
+                    <property name="label" translatable="yes">_Dependent</property>
+                    <property name="use_markup">True</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">dep-view</property>
                   </object>
-                  <packing>
-                    <property name="left_attach">2</property>
-                    <property name="top_attach">0</property>
-                  </packing>
                 </child>
+              </object>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="top_attach">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkFrame" id="frame3">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="label_xalign">0</property>
+                <property name="shadow_type">none</property>
                 <child>
-                  <object class="GtkFrame" id="frame3">
+                  <object class="GtkScrolledWindow" id="scrolledwindow2">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="margin-start">12</property>
+                    <property name="can_focus">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">none</property>
+                    <property name="hscrollbar_policy">never</property>
+                    <property name="shadow_type">etched-in</property>
                     <child>
-                          <object class="GtkScrolledWindow" id="scrolledwindow2">
-                            <property name="visible">True</property>
-			    <property name="margin-start">12</property>
-                            <property name="can_focus">True</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="hscrollbar_policy">never</property>
-                            <property name="shadow_type">etched-in</property>
-                            <child>
-                              <object class="PsppireVarView" id="indep-view">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="border_width">0</property>
-                                <property name="headers_visible">False</property>
-                                <property name="headers_clickable">False</property>
-                                <child internal-child="selection">
-                                  <object class="GtkTreeSelection" id="psppire-var-view-selection2"/>
-                                </child>
-                              </object>
-                            </child>
-                      </object>
-                    </child>
-                    <child type="label">
-                      <object class="GtkLabel" id="label3">
+                      <object class="PsppireVarView" id="indep-view">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label" translatable="yes">_Independent</property>
-                        <property name="use_markup">True</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">indep-view</property>
+                        <property name="border_width">0</property>
+                        <property name="headers_visible">False</property>
+                        <property name="headers_clickable">False</property>
+                        <child internal-child="selection">
+                          <object class="GtkTreeSelection" id="psppire-var-view-selection2"/>
+                        </child>
                       </object>
                     </child>
                   </object>
-                  <packing>
-                    <property name="left_attach">2</property>
-                    <property name="top_attach">1</property>
-                  </packing>
+                </child>
+                <child type="label">
+                  <object class="GtkLabel" id="label3">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="label" translatable="yes">_Independent</property>
+                    <property name="use_markup">True</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">indep-view</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="top_attach">1</property>
+              </packing>
             </child>
           </object>
           <packing>
@@ -346,23 +346,23 @@
             <property name="label_xalign">0</property>
             <property name="shadow_type">none</property>
             <child>
-                  <object class="GtkScrolledWindow" id="scrolledwindow4">
+              <object class="GtkScrolledWindow" id="scrolledwindow4">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="hscrollbar_policy">never</property>
+                <property name="shadow_type">etched-in</property>
+                <child>
+                  <object class="PsppireCheckboxTreeview" id="stat-view">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="hscrollbar_policy">never</property>
-                    <property name="shadow_type">etched-in</property>
-                    <child>
-                      <object class="PsppireCheckboxTreeview" id="stat-view">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="headers_visible">False</property>
-                        <child internal-child="selection">
-                          <object class="GtkTreeSelection" id="psppire-checkbox-treeview-selection1"/>
-                        </child>
-                      </object>
+                    <property name="headers_visible">False</property>
+                    <child internal-child="selection">
+                      <object class="GtkTreeSelection" id="psppire-checkbox-treeview-selection1"/>
                     </child>
+                  </object>
+                </child>
               </object>
             </child>
             <child type="label">
diff --git a/src/ui/gui/roc.ui b/src/ui/gui/roc.ui
index 920db0f159..3733eae385 100644
--- a/src/ui/gui/roc.ui
+++ b/src/ui/gui/roc.ui
@@ -99,25 +99,25 @@
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">none</property>
                 <child>
-                      <object class="GtkScrolledWindow" id="scrolledwindow1">
+                  <object class="GtkScrolledWindow" id="scrolledwindow1">
+                    <property name="visible">True</property>
+                    <property name="margin-start">12</property>
+                    <property name="can_focus">True</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="vexpand">True</property>
+                    <property name="hscrollbar_policy">never</property>
+                    <property name="shadow_type">etched-in</property>
+                    <child>
+                      <object class="PsppireVarView" id="psppire-var-view1">
                         <property name="visible">True</property>
-			<property name="margin-start">12</property>
                         <property name="can_focus">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="vexpand">True</property>
-                        <property name="hscrollbar_policy">never</property>
-                        <property name="shadow_type">etched-in</property>
-                        <child>
-                          <object class="PsppireVarView" id="psppire-var-view1">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="border_width">5</property>
-                            <property name="headers_visible">False</property>
-                            <property name="headers_clickable">False</property>
-                            <child internal-child="selection">
-                              <object class="GtkTreeSelection" id="psppire-var-view-selection1"/>
-                            </child>
-                          </object>
+                        <property name="border_width">5</property>
+                        <property name="headers_visible">False</property>
+                        <property name="headers_clickable">False</property>
+                        <child internal-child="selection">
+                          <object class="GtkTreeSelection" id="psppire-var-view-selection1"/>
+                        </child>
+                      </object>
                     </child>
                   </object>
                 </child>
@@ -144,13 +144,13 @@
                 <property name="can_focus">False</property>
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">none</property>
-                    <child>
-                      <object class="GtkEntry" id="entry1">
-			<property name="margin-start">12</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="invisible_char">•</property>
-                      </object>
+                <child>
+                  <object class="GtkEntry" id="entry1">
+                    <property name="margin-start">12</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">•</property>
+                  </object>
                 </child>
                 <child type="label">
                   <object class="GtkLabel" id="label2">
@@ -223,87 +223,87 @@
                     <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
                     <child>
-                          <object class="GtkButtonBox" id="vbuttonbox1">
+                      <object class="GtkButtonBox" id="vbuttonbox1">
+                        <property name="visible">True</property>
+                        <property name="margin-start">12</property>
+                        <property name="can_focus">False</property>
+                        <property name="orientation">vertical</property>
+                        <child>
+                          <object class="GtkCheckButton" id="curve">
+                            <property name="label" translatable="yes">ROC C_urve</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="xalign">0.5</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkBox" id="hbox2">
                             <property name="visible">True</property>
-			    <property name="margin-start">12</property>
                             <property name="can_focus">False</property>
-                            <property name="orientation">vertical</property>
                             <child>
-                              <object class="GtkCheckButton" id="curve">
-                                <property name="label" translatable="yes">ROC C_urve</property>
+                              <object class="GtkCheckButton" id="reference-line">
+                                <property name="label" translatable="yes">_With diagonal reference line</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="use_underline">True</property>
-                                <property name="xalign">0.5</property>
+                                <property name="xalign">0</property>
                                 <property name="draw_indicator">True</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
+                                <property name="padding">12</property>
                                 <property name="position">0</property>
                               </packing>
                             </child>
-                            <child>
-                              <object class="GtkBox" id="hbox2">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <child>
-                                  <object class="GtkCheckButton" id="reference-line">
-                                    <property name="label" translatable="yes">_With diagonal reference line</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="xalign">0</property>
-                                    <property name="draw_indicator">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="padding">12</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkCheckButton" id="standard-error">
-                                <property name="label" translatable="yes">Standard _Error and Confidence Interval</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="use_underline">True</property>
-                                <property name="xalign">0.5</property>
-                                <property name="draw_indicator">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">2</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkCheckButton" id="co-ordinates">
-                                <property name="label" translatable="yes">_Coordinate points of the ROC Curve</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="use_underline">True</property>
-                                <property name="xalign">0.5</property>
-                                <property name="draw_indicator">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">3</property>
-                              </packing>
-                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="standard-error">
+                            <property name="label" translatable="yes">Standard _Error and Confidence Interval</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="xalign">0.5</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="co-ordinates">
+                            <property name="label" translatable="yes">_Coordinate points of the ROC Curve</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="xalign">0.5</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">3</property>
+                          </packing>
+                        </child>
                       </object>
                     </child>
                     <child type="label">
diff --git a/src/ui/gui/sort.ui b/src/ui/gui/sort.ui
index 9d5b640a0a..0966a49178 100644
--- a/src/ui/gui/sort.ui
+++ b/src/ui/gui/sort.ui
@@ -129,47 +129,47 @@
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="label_xalign">0</property>
                     <child>
-                          <object class="GtkButtonBox" id="vbuttonbox4">
+                      <object class="GtkButtonBox" id="vbuttonbox4">
+                        <property name="visible">True</property>
+                        <property name="margin-start">12</property>
+                        <property name="can_focus">False</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="orientation">vertical</property>
+                        <property name="layout_style">spread</property>
+                        <child>
+                          <object class="GtkRadioButton" id="sort-cases-radiobutton0">
+                            <property name="label" translatable="yes">Ascending</property>
                             <property name="visible">True</property>
-			    <property name="margin-start">12</property>
-                            <property name="can_focus">False</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="orientation">vertical</property>
-                            <property name="layout_style">spread</property>
-                            <child>
-                              <object class="GtkRadioButton" id="sort-cases-radiobutton0">
-                                <property name="label" translatable="yes">Ascending</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="xalign">0</property>
-                                <property name="active">True</property>
-                                <property name="draw_indicator">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkRadioButton" id="sort-cases-radiobutton1">
-                                <property name="label" translatable="yes">Descending</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="xalign">0</property>
-                                <property name="draw_indicator">True</property>
-                                <property name="group">sort-cases-radiobutton0</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
+                            <property name="xalign">0</property>
+                            <property name="active">True</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkRadioButton" id="sort-cases-radiobutton1">
+                            <property name="label" translatable="yes">Descending</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <property name="xalign">0</property>
+                            <property name="draw_indicator">True</property>
+                            <property name="group">sort-cases-radiobutton0</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
                       </object>
                     </child>
                     <child type="label">
diff --git a/src/ui/gui/syntax-editor.ui b/src/ui/gui/syntax-editor.ui
index 2cdea8981b..d4f348f3ab 100644
--- a/src/ui/gui/syntax-editor.ui
+++ b/src/ui/gui/syntax-editor.ui
@@ -14,19 +14,19 @@
           <object class="GtkAction" id="new2">
             <property name="stock-id">file-new-data</property>
             <property name="name">new2</property>
-	    <property name="label" translatable="yes">_New...</property>
+            <property name="label" translatable="yes">_New...</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="file_new_syntax">
-	    <property name="stock-id">file-syntax-data</property>
+            <property name="stock-id">file-syntax-data</property>
             <property name="name">file_new_syntax</property>
             <property name="label" translatable="yes">_Syntax</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="file_new_data">
-	    <property name="stock-id">file-system-data</property>
+            <property name="stock-id">file-system-data</property>
             <property name="name">file_new_data</property>
             <property name="label" translatable="yes">_Data</property>
           </object>
@@ -42,7 +42,7 @@
           <object class="GtkAction" id="file_save">
             <property name="stock-id">file-save-data</property>
             <property name="name">file_save</property>
-	    <property name="label" translatable="yes">_Save...</property>
+            <property name="label" translatable="yes">_Save...</property>
           </object>
         </child>
         <child>
@@ -56,7 +56,7 @@
           <object class="GtkAction" id="file_print">
             <property name="name">file_print</property>
             <property name="stock-id">file-print</property>
-	    <property name="label" translatable="yes">_Print...</property>
+            <property name="label" translatable="yes">_Print...</property>
           </object>
         </child>
         <child>
@@ -103,14 +103,14 @@
           <object class="GtkAction" id="edit_undo">
             <property name="stock-id">edit-undo</property>
             <property name="name">edit_undo</property>
-	    <property name="sensitive">false</property>
+            <property name="sensitive">false</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="edit_redo">
             <property name="stock-id">edit-redo</property>
             <property name="name">edit_redo</property>
-	    <property name="sensitive">false</property>
+            <property name="sensitive">false</property>
           </object>
         </child>
         <child>
@@ -121,21 +121,21 @@
         </child>
         <child>
           <object class="GtkAction" id="run_all">
-	    <property name="stock-id">run-all</property>
+            <property name="stock-id">run-all</property>
             <property name="name">run_all</property>
             <property name="label" translatable="yes">All</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="run_selection">
-	    <property name="stock-id">run-selection</property>
+            <property name="stock-id">run-selection</property>
             <property name="name">run_selection</property>
             <property name="label" translatable="yes">Selection</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="run_current_line">
-	    <property name="stock-id">run-current-line</property>
+            <property name="stock-id">run-current-line</property>
             <property name="name">run_current_line</property>
             <property name="label" translatable="yes">Current Line</property>
           </object>
@@ -143,7 +143,7 @@
         </child>
         <child>
           <object class="GtkAction" id="run_to_end">
-	    <property name="stock-id">run-to-end</property>
+            <property name="stock-id">run-to-end</property>
             <property name="name">run-to-end</property>
             <property name="label" translatable="yes">To End</property>
           </object>
@@ -156,7 +156,7 @@
         </child>
         <child>
           <object class="GtkAction" id="windows_minimise_all">
-	    <property name="stock-id">windows-minimize-all</property>
+            <property name="stock-id">windows-minimize-all</property>
             <property name="name">windows_minimise_all</property>
             <property name="label" translatable="yes">_Minimize All Windows</property>
           </object>
diff --git a/src/ui/gui/t-test.ui b/src/ui/gui/t-test.ui
index 1d832fbae3..a502814d98 100644
--- a/src/ui/gui/t-test.ui
+++ b/src/ui/gui/t-test.ui
@@ -34,51 +34,51 @@
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label_xalign">0</property>
                 <child>
-                      <object class="GtkButtonBox" id="vbuttonbox1">
+                  <object class="GtkButtonBox" id="vbuttonbox1">
+                    <property name="visible">True</property>
+                    <property name="margin-start">12</property>
+                    <property name="can_focus">False</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="orientation">vertical</property>
+                    <property name="layout_style">spread</property>
+                    <child>
+                      <object class="GtkRadioButton" id="radiobutton1">
+                        <property name="label" translatable="yes">Exclude cases _analysis by analysis</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">0.5</property>
+                        <property name="active">True</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkRadioButton" id="radiobutton2">
+                        <property name="label" translatable="yes">Exclude cases _listwise</property>
                         <property name="visible">True</property>
-			<property name="margin-start">12</property>
-                        <property name="can_focus">False</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="orientation">vertical</property>
-                        <property name="layout_style">spread</property>
-                        <child>
-                          <object class="GtkRadioButton" id="radiobutton1">
-                            <property name="label" translatable="yes">Exclude cases _analysis by analysis</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
-                            <property name="active">True</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkRadioButton" id="radiobutton2">
-                            <property name="label" translatable="yes">Exclude cases _listwise</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
-                            <property name="active">True</property>
-                            <property name="draw_indicator">True</property>
-                            <property name="group">radiobutton1</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">0.5</property>
+                        <property name="active">True</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">radiobutton1</property>
                       </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
                 </child>
                 <child type="label">
                   <object class="GtkLabel" id="label3">
@@ -162,25 +162,25 @@
             <property name="label_xalign">0</property>
             <property name="shadow_type">none</property>
             <child>
-                  <object class="GtkScrolledWindow" id="scrolledwindow3">
+              <object class="GtkScrolledWindow" id="scrolledwindow3">
+                <property name="visible">True</property>
+                <property name="margin-start">12</property>
+                <property name="can_focus">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="hscrollbar_policy">never</property>
+                <property name="shadow_type">etched-in</property>
+                <child>
+                  <object class="PsppireVarView" id="one-sample-t-test-treeview1">
                     <property name="visible">True</property>
-		    <property name="margin-start">12</property>
                     <property name="can_focus">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="hscrollbar_policy">never</property>
-                    <property name="shadow_type">etched-in</property>
-                    <child>
-                      <object class="PsppireVarView" id="one-sample-t-test-treeview1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="border_width">0</property>
-                        <property name="headers_visible">False</property>
-                        <child internal-child="selection">
-                          <object class="GtkTreeSelection" id="psppire-var-view-selection1"/>
-                        </child>
-                      </object>
+                    <property name="border_width">0</property>
+                    <property name="headers_visible">False</property>
+                    <child internal-child="selection">
+                      <object class="GtkTreeSelection" id="psppire-var-view-selection1"/>
                     </child>
+                  </object>
+                </child>
               </object>
             </child>
             <child type="label">
diff --git a/src/ui/gui/text-data-import.ui b/src/ui/gui/text-data-import.ui
index ed2bbc2dd1..0fd1875d32 100644
--- a/src/ui/gui/text-data-import.ui
+++ b/src/ui/gui/text-data-import.ui
@@ -8,7 +8,7 @@
     <property name="title" translatable="yes">Importing Textual Data</property>
     <child>
       <object class="GtkBox" id="vbox3">
-	<property name="orientation">GTK_ORIENTATION_VERTICAL</property>
+        <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
         <property name="visible">True</property>
         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
         <property name="orientation">vertical</property>
@@ -45,7 +45,7 @@
                     <child>
                       <object class="GtkGrid" id="button-table">
                         <property name="visible">True</property>
-			<property name="orientation">GTK_ORIENTATION_VERTICAL</property>
+                        <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
                         <child>
                           <object class="GtkRadioButton" id="import-all-cases">
                             <property name="visible">True</property>
@@ -82,8 +82,8 @@
                             <property name="label" translatable="yes">All cases</property>
                           </object>
                           <packing>
-			    <property name="left-attach">1</property>
-			    <property name="top-attach">0</property>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
                           </packing>
                         </child>
                         <child>
@@ -116,14 +116,13 @@
       </object>
     </child>
   </object>
-
   <object class="GtkWindow" id="FirstLine">
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
     <property name="border_width">12</property>
     <property name="title" translatable="yes">Select Data to Import</property>
     <child>
       <object class="GtkBox" id="vbox2">
-	<property name="orientation">GTK_ORIENTATION_VERTICAL</property>
+        <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
         <property name="visible">True</property>
         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
         <property name="orientation">vertical</property>
@@ -155,8 +154,8 @@
             </child>
           </object>
           <packing>
-	    <property name="expand">True</property>
-	    <property name="fill">True</property>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
@@ -177,21 +176,20 @@
       </object>
     </child>
   </object>
-
   <object class="GtkWindow" id="Separators">
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
     <property name="border_width">12</property>
     <property name="title" translatable="yes">Choose Separators</property>
     <child>
       <object class="GtkBox" id="vbox4">
-	<property name="orientation">GTK_ORIENTATION_VERTICAL</property>
+        <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
         <property name="visible">True</property>
         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
         <property name="orientation">vertical</property>
         <property name="spacing">12</property>
         <child>
           <object class="GtkBox" id="hbox2">
-	    <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
+            <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
             <property name="visible">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <property name="spacing">12</property>
@@ -207,186 +205,186 @@
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="left_padding">12</property>
                     <child>
-		      <object class="GtkGrid" id="table1">
-			<property name="visible">True</property>
-			<property name="can_focus">False</property>
-			<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-			<property name="row_spacing">6</property>
-			<property name="column_spacing">6</property>
-			<child>
-			  <object class="GtkEntry" id="custom-entry">
-			    <property name="visible">True</property>
-			    <property name="can_focus">True</property>
-			    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-			  </object>
-			  <packing>
-			    <property name="left_attach">1</property>
-			    <property name="top_attach">3</property>
-			    <property name="width">2</property>
-			  </packing>
-			</child>
-			<child>
-			  <object class="GtkCheckButton" id="custom-cb">
-			    <property name="label" translatable="yes">C_ustom</property>
-			    <property name="visible">True</property>
-			    <property name="can_focus">True</property>
-			    <property name="receives_default">False</property>
-			    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-			    <property name="use_underline">True</property>
-			    <property name="xalign">0.5</property>
-			    <property name="draw_indicator">True</property>
-			  </object>
-			  <packing>
-			    <property name="left_attach">0</property>
-			    <property name="top_attach">3</property>
-			  </packing>
-			</child>
-			<child>
-			  <object class="GtkCheckButton" id="slash">
-			    <property name="label" translatable="yes">Slas_h (/)</property>
-			    <property name="visible">True</property>
-			    <property name="can_focus">True</property>
-			    <property name="receives_default">False</property>
-			    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>			
-			    <property name="use_underline">True</property>
-			    <property name="xalign">0.5</property>
-			    <property name="draw_indicator">True</property>
-			  </object>
-			  <packing>
-			    <property name="left_attach">2</property>
-			    <property name="top_attach">2</property>
-			  </packing>
-			</child>
-			<child>
-			  <object class="GtkCheckButton" id="semicolon">
-			    <property name="label" translatable="yes">Semicolo_n (;)</property>
-			    <property name="visible">True</property>
-			    <property name="can_focus">True</property>
-			    <property name="receives_default">False</property>
-			    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-			    <property name="use_underline">True</property>
-			    <property name="xalign">0.5</property>
-			    <property name="draw_indicator">True</property>
-			  </object>
-			  <packing>
-			    <property name="left_attach">1</property>
-			    <property name="top_attach">2</property>
-			  </packing>
-			</child>
-			<child>
-			  <object class="GtkCheckButton" id="pipe">
-			    <property name="label" translatable="yes">P_ipe (|)</property>
-			    <property name="visible">True</property>
-			    <property name="can_focus">True</property>
-			    <property name="receives_default">False</property>
-			    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-			    <property name="use_underline">True</property>
-			    <property name="xalign">0.5</property>
-			    <property name="draw_indicator">True</property>
-			  </object>
-			  <packing>
-			    <property name="left_attach">0</property>
-			    <property name="top_attach">2</property>
-			  </packing>
-			</child>
-			<child>
-			  <object class="GtkCheckButton" id="hyphen">
-			    <property name="label" translatable="yes">H_yphen (-)</property>
-			    <property name="visible">True</property>
-			    <property name="can_focus">True</property>
-			    <property name="receives_default">False</property>
-			    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-			    <property name="use_underline">True</property>
-			    <property name="xalign">0.5</property>
-			    <property name="draw_indicator">True</property>
-			  </object>
-			  <packing>
-			    <property name="left_attach">2</property>
-			    <property name="top_attach">1</property>
-			  </packing>
-			</child>
-			<child>
-			  <object class="GtkCheckButton" id="comma">
-			    <property name="label" translatable="yes">Co_mma (,)</property>
-			    <property name="visible">True</property>
-			    <property name="can_focus">True</property>
-			    <property name="receives_default">False</property>
-			    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-			    <property name="use_underline">True</property>
-			    <property name="xalign">0.5</property>
-			    <property name="draw_indicator">True</property>
-			  </object>
-			  <packing>
-			    <property name="left_attach">1</property>
-			    <property name="top_attach">1</property>
-			  </packing>
-			</child>
-			<child>
-			  <object class="GtkCheckButton" id="colon">
-			    <property name="label" translatable="yes">_Colon (:)</property>
-			    <property name="visible">True</property>
-			    <property name="can_focus">True</property>
-			    <property name="receives_default">False</property>
-			    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-			    <property name="use_underline">True</property>
-			    <property name="xalign">0.5</property>
-			    <property name="draw_indicator">True</property>
-			  </object>
-			  <packing>
-			    <property name="left_attach">0</property>
-			    <property name="top_attach">1</property>
-			  </packing>
-			</child>
-			<child>
-			  <object class="GtkCheckButton" id="bang">
-			    <property name="label" translatable="yes">Ban_g (!)</property>
-			    <property name="visible">True</property>
-			    <property name="can_focus">True</property>
-			    <property name="receives_default">False</property>
-			    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-			    <property name="use_underline">True</property>
-			    <property name="xalign">0.5</property>
-			    <property name="draw_indicator">True</property>
-			  </object>
-			  <packing>
-			    <property name="left_attach">2</property>
-			    <property name="top_attach">0</property>
-			  </packing>
-			</child>
-			<child>
-			  <object class="GtkCheckButton" id="tab">
-			    <property name="label" translatable="yes">Ta_b</property>
-			    <property name="visible">True</property>
-			    <property name="can_focus">True</property>
-			    <property name="receives_default">False</property>
-			    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-			    <property name="use_underline">True</property>
-			    <property name="xalign">0.5</property>
-			    <property name="draw_indicator">True</property>
-			  </object>
-			  <packing>
-			    <property name="left_attach">1</property>
-			    <property name="top_attach">0</property>
-			  </packing>
-			</child>
-			<child>
-			  <object class="GtkCheckButton" id="space">
-			    <property name="label" translatable="yes">_Space</property>
-			    <property name="visible">True</property>
-			    <property name="can_focus">True</property>
-			    <property name="receives_default">False</property>
-			    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-			    <property name="use_underline">True</property>
-			    <property name="xalign">0.5</property>
-			    <property name="draw_indicator">True</property>
-			  </object>
-			  <packing>
-			    <property name="left_attach">0</property>
-			    <property name="top_attach">0</property>
-			  </packing>
-			</child>
-		      </object>
-		    </child>
+                      <object class="GtkGrid" id="table1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="row_spacing">6</property>
+                        <property name="column_spacing">6</property>
+                        <child>
+                          <object class="GtkEntry" id="custom-entry">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">3</property>
+                            <property name="width">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="custom-cb">
+                            <property name="label" translatable="yes">C_ustom</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <property name="use_underline">True</property>
+                            <property name="xalign">0.5</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="slash">
+                            <property name="label" translatable="yes">Slas_h (/)</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <property name="use_underline">True</property>
+                            <property name="xalign">0.5</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">2</property>
+                            <property name="top_attach">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="semicolon">
+                            <property name="label" translatable="yes">Semicolo_n (;)</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <property name="use_underline">True</property>
+                            <property name="xalign">0.5</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="pipe">
+                            <property name="label" translatable="yes">P_ipe (|)</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <property name="use_underline">True</property>
+                            <property name="xalign">0.5</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="hyphen">
+                            <property name="label" translatable="yes">H_yphen (-)</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <property name="use_underline">True</property>
+                            <property name="xalign">0.5</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">2</property>
+                            <property name="top_attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="comma">
+                            <property name="label" translatable="yes">Co_mma (,)</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <property name="use_underline">True</property>
+                            <property name="xalign">0.5</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="colon">
+                            <property name="label" translatable="yes">_Colon (:)</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <property name="use_underline">True</property>
+                            <property name="xalign">0.5</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="bang">
+                            <property name="label" translatable="yes">Ban_g (!)</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <property name="use_underline">True</property>
+                            <property name="xalign">0.5</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">2</property>
+                            <property name="top_attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="tab">
+                            <property name="label" translatable="yes">Ta_b</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <property name="use_underline">True</property>
+                            <property name="xalign">0.5</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="space">
+                            <property name="label" translatable="yes">_Space</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <property name="use_underline">True</property>
+                            <property name="xalign">0.5</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">0</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
                   </object>
                 </child>
                 <child type="label">
@@ -508,21 +506,20 @@
           </object>
           <packing>
             <property name="position">1</property>
-	    <property name="expand">True</property>
-	    <property name="fill">True</property>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
           </packing>
         </child>
       </object>
     </child>
   </object>
-
   <object class="GtkWindow" id="Formats">
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
     <property name="border_width">12</property>
     <property name="title" translatable="yes">Adjust Variable Formats</property>
     <child>
       <object class="GtkBox" id="vbox5">
-	<property name="orientation">GTK_ORIENTATION_VERTICAL</property>
+        <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
         <property name="visible">True</property>
         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
         <property name="orientation">vertical</property>
@@ -639,14 +636,13 @@
       </object>
     </child>
   </object>
-
   <object class="GtkWindow" id="Sheet">
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
     <property name="border_width">12</property>
     <property name="title" translatable="yes">Importing Spreadsheet Data</property>
     <child>
       <object class="GtkBox" id="vbox1">
-	<property name="orientation">GTK_ORIENTATION_VERTICAL</property>
+        <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
         <property name="visible">True</property>
         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
         <property name="orientation">vertical</property>
@@ -679,97 +675,97 @@
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="left_padding">12</property>
                     <child>
-		      <object class="GtkGrid" id="table3">
-			<property name="visible">True</property>
-			<property name="can_focus">False</property>
-			<child>
-			  <object class="GtkEntry" id="cell-range-entry">
-			    <property name="visible">True</property>
-			    <property name="can_focus">True</property>
-			    <property name="invisible_char">●</property>
-			  </object>
-			  <packing>
-			    <property name="left_attach">1</property>
-			    <property name="top_attach">0</property>
-			  </packing>
-			</child>
-			<child>
-			  <object class="GtkComboBox" id="sheet-entry">
-			    <property name="visible">True</property>
-			    <property name="can_focus">True</property>
-			    <property name="active">0</property>
-			  </object>
-			  <packing>
-			    <property name="left_attach">1</property>
-			    <property name="top_attach">1</property>
-			  </packing>
-			</child>
-			<child>
-			  <object class="GtkLabel" id="cell-range-label">
-			    <property name="visible">True</property>
-			    <property name="can_focus">False</property>
-			    <property name="xalign">1</property>
-			    <property name="label" translatable="yes">_Cells: </property>
-			    <property name="use_underline">True</property>
-			    <property name="mnemonic_widget">cell-range-entry</property>
-			  </object>
-			  <packing>
-			    <property name="left_attach">0</property>
-			    <property name="top_attach">0</property>
-			  </packing>
-			</child>
-			<child>
-			  <object class="GtkLabel" id="sheet-label">
-			    <property name="visible">True</property>
-			    <property name="can_focus">False</property>
-			    <property name="xalign">1</property>
-			    <property name="label" translatable="yes">_Sheet Index: </property>
-			    <property name="use_underline">True</property>
-			    <property name="mnemonic_widget">sheet-entry</property>
-			  </object>
-			  <packing>
-			    <property name="left_attach">0</property>
-			    <property name="top_attach">1</property>
-			  </packing>
-			</child>
-			<child>
-			  <object class="GtkCheckButton" id="readnames-checkbox">
-			    <property name="label" translatable="yes">Use first row as _variable names</property>
-			    <property name="visible">True</property>
-			    <property name="can_focus">True</property>
-			    <property name="receives_default">False</property>
-			    <property name="use_underline">True</property>
-			    <property name="xalign">0.5</property>
-			    <property name="image_position">right</property>
-			    <property name="draw_indicator">True</property>
-			  </object>
-			  <packing>
-			    <property name="left_attach">0</property>
-			    <property name="top_attach">2</property>
-			    <property name="width">2</property>
-			  </packing>
-			</child>
-		      </object>
-		    </child>
-		  </object>
-		</child>
-		<child type="label">
-		  <object class="GtkLabel" id="label4">
-		    <property name="visible">True</property>
-		    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-		    <property name="label" translatable="yes">&lt;b&gt;Cells to Import&lt;/b&gt;</property>
-		    <property name="use_markup">True</property>
-		  </object>
-		</child>
-	      </object>
-	    </child>
-	  </object>
-	  <packing>
-	    <property name="expand">False</property>
-	    <property name="fill">False</property>
-	    <property name="position">1</property>
-	  </packing>
-	</child>
+                      <object class="GtkGrid" id="table3">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <child>
+                          <object class="GtkEntry" id="cell-range-entry">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="invisible_char">&#x25CF;</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkComboBox" id="sheet-entry">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="active">0</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="cell-range-label">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="xalign">1</property>
+                            <property name="label" translatable="yes">_Cells: </property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">cell-range-entry</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="sheet-label">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="xalign">1</property>
+                            <property name="label" translatable="yes">_Sheet Index: </property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">sheet-entry</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="readnames-checkbox">
+                            <property name="label" translatable="yes">Use first row as _variable names</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="xalign">0.5</property>
+                            <property name="image_position">right</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">2</property>
+                            <property name="width">2</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+                <child type="label">
+                  <object class="GtkLabel" id="label4">
+                    <property name="visible">True</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Cells to Import&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
       </object>
     </child>
   </object>
diff --git a/src/ui/gui/univariate.ui b/src/ui/gui/univariate.ui
index 404a046ae8..6e04ec8854 100644
--- a/src/ui/gui/univariate.ui
+++ b/src/ui/gui/univariate.ui
@@ -99,22 +99,22 @@
             <property name="label_xalign">0</property>
             <property name="shadow_type">none</property>
             <child>
-                  <object class="GtkScrolledWindow" id="scrolledwindow4">
+              <object class="GtkScrolledWindow" id="scrolledwindow4">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="hscrollbar_policy">never</property>
+                <property name="shadow_type">etched-in</property>
+                <child>
+                  <object class="GtkTreeView" id="stat-view">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="hscrollbar_policy">never</property>
-                    <property name="shadow_type">etched-in</property>
-                    <child>
-                      <object class="GtkTreeView" id="stat-view">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="headers_visible">False</property>
-                        <child internal-child="selection">
-                          <object class="GtkTreeSelection" id="treeview-selection1"/>
-                        </child>
-                      </object>
+                    <property name="headers_visible">False</property>
+                    <child internal-child="selection">
+                      <object class="GtkTreeSelection" id="treeview-selection1"/>
+                    </child>
+                  </object>
                 </child>
               </object>
             </child>
@@ -244,11 +244,11 @@
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">none</property>
                 <child>
-                      <object class="GtkEntry" id="dep-entry">
-			<property name="margin-start">12</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="invisible_char">●</property>
+                  <object class="GtkEntry" id="dep-entry">
+                    <property name="margin-start">12</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">●</property>
                   </object>
                 </child>
                 <child type="label">
@@ -277,24 +277,24 @@
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">none</property>
                 <child>
-                      <object class="GtkScrolledWindow" id="scrolledwindow2">
+                  <object class="GtkScrolledWindow" id="scrolledwindow2">
+                    <property name="visible">True</property>
+                    <property name="margin-start">12</property>
+                    <property name="can_focus">True</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="hscrollbar_policy">never</property>
+                    <property name="shadow_type">etched-in</property>
+                    <child>
+                      <object class="PsppireVarView" id="factors-view">
                         <property name="visible">True</property>
-			<property name="margin-start">12</property>
                         <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="hscrollbar_policy">never</property>
-                        <property name="shadow_type">etched-in</property>
-                        <child>
-                          <object class="PsppireVarView" id="factors-view">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="border_width">0</property>
-                            <property name="headers_visible">False</property>
-                            <property name="headers_clickable">False</property>
-                            <child internal-child="selection">
-                              <object class="GtkTreeSelection" id="psppire-var-view-selection"/>
-                            </child>
+                        <property name="border_width">0</property>
+                        <property name="headers_visible">False</property>
+                        <property name="headers_clickable">False</property>
+                        <child internal-child="selection">
+                          <object class="GtkTreeSelection" id="psppire-var-view-selection"/>
+                        </child>
                       </object>
                     </child>
                   </object>
diff --git a/src/ui/gui/var-sheet.ui b/src/ui/gui/var-sheet.ui
index 84627f8117..6c990ef8f3 100644
--- a/src/ui/gui/var-sheet.ui
+++ b/src/ui/gui/var-sheet.ui
@@ -3,80 +3,80 @@
   <object class="GtkUIManager" id="var_sheet_uim">
     <ui>
       <menubar name="menubar">
-	<placeholder name="VarSheetEditMenu">
-	  <menu action="edit">
-	    <menuitem action="edit_insert-variable"/>
-	    <menuitem action="edit_goto-variable"/>
-	    <separator/>
-	    <menuitem action="edit_cut"/>
-	    <menuitem action="edit_copy"/>
-	    <menuitem action="edit_paste"/>
-	    <menuitem action="edit_clear-variables"/>
-	  </menu>
-	</placeholder>
+        <placeholder name="VarSheetEditMenu">
+          <menu action="edit">
+            <menuitem action="edit_insert-variable"/>
+            <menuitem action="edit_goto-variable"/>
+            <separator/>
+            <menuitem action="edit_cut"/>
+            <menuitem action="edit_copy"/>
+            <menuitem action="edit_paste"/>
+            <menuitem action="edit_clear-variables"/>
+          </menu>
+        </placeholder>
       </menubar>
       <toolbar name="toolbar">
-	<placeholder name="VarSheetToolItems">
-	  <toolitem name="toolbar_goto-variable" action="edit_goto-variable"/>
-	  <toolitem name="toolbar_insert-variable" action="edit_insert-variable"/>
-	</placeholder>
+        <placeholder name="VarSheetToolItems">
+          <toolitem name="toolbar_goto-variable" action="edit_goto-variable"/>
+          <toolitem name="toolbar_insert-variable" action="edit_insert-variable"/>
+        </placeholder>
       </toolbar>
       <popup name="varsheet-variable-popup">
-	<menuitem action="edit_insert-variable"/>
-	<separator/>
-	<menuitem action="edit_clear-variables"/>
+        <menuitem action="edit_insert-variable"/>
+        <separator/>
+        <menuitem action="edit_clear-variables"/>
       </popup>
     </ui>
     <child>
       <object class="GtkActionGroup" id="actiongroup4">
-	<child>
-	  <object class="GtkAction" id="edit">
-	    <property name="name">edit</property>
-	    <property name="label" translatable="yes">_Edit</property>
-	  </object>
-	</child>
-	<child>
-	  <object class="GtkAction" id="edit_insert-variable">
-	    <property name="name">edit_insert-variable</property>
-	    <property name="label" translatable="yes">Insert Variable</property>
-	    <property name="tooltip" translatable="yes">Create a new variable at the current position</property>
-	    <property name="stock-id">edit-insert-variable</property>
-	  </object>
-	</child>
+        <child>
+          <object class="GtkAction" id="edit">
+            <property name="name">edit</property>
+            <property name="label" translatable="yes">_Edit</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="edit_insert-variable">
+            <property name="name">edit_insert-variable</property>
+            <property name="label" translatable="yes">Insert Variable</property>
+            <property name="tooltip" translatable="yes">Create a new variable at the current position</property>
+            <property name="stock-id">edit-insert-variable</property>
+          </object>
+        </child>
         <child>
           <object class="PsppireDialogActionVarInfo" id="edit_goto-variable">
             <property name="name">edit_goto-variable</property>
             <property name="label" translatable="yes">Go To Variable...</property>
-	    <property name="tooltip" translatable="yes">Jump to variable</property>
-	    <property name="stock-id">edit-go-to-variable</property>
+            <property name="tooltip" translatable="yes">Jump to variable</property>
+            <property name="stock-id">edit-go-to-variable</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="edit_cut">
+            <property name="stock-id">edit-cut</property>
+            <property name="name">edit_cut</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="edit_copy">
+            <property name="stock-id">edit-copy</property>
+            <property name="name">edit_copy</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="edit_paste">
+            <property name="stock-id">edit-paste</property>
+            <property name="name">edit_paste</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="edit_clear-variables">
+            <property name="name">edit_clear-variables</property>
+            <property name="label" translatable="yes">Cl_ear Variables</property>
+            <property name="tooltip" translatable="yes">Delete the variables at the selected position(s)</property>
+            <property name="stock-id">edit-clear</property>
           </object>
         </child>
-	<child>
-	  <object class="GtkAction" id="edit_cut">
-	    <property name="stock-id">edit-cut</property>
-	    <property name="name">edit_cut</property>
-	  </object>
-	</child>
-	<child>
-	  <object class="GtkAction" id="edit_copy">
-	    <property name="stock-id">edit-copy</property>
-	    <property name="name">edit_copy</property>
-	  </object>
-	</child>
-	<child>
-	  <object class="GtkAction" id="edit_paste">
-	    <property name="stock-id">edit-paste</property>
-	    <property name="name">edit_paste</property>
-	  </object>
-	</child>
-	<child>
-	  <object class="GtkAction" id="edit_clear-variables">
-	    <property name="name">edit_clear-variables</property>
-	    <property name="label" translatable="yes">Cl_ear Variables</property>
-	    <property name="tooltip" translatable="yes">Delete the variables at the selected position(s)</property>
-	    <property name="stock-id">edit-clear</property>
-	  </object>
-	</child>
       </object>
     </child>
   </object>
diff --git a/src/ui/gui/variable-info.ui b/src/ui/gui/variable-info.ui
index 05bf225d3f..e08dfa6f1f 100644
--- a/src/ui/gui/variable-info.ui
+++ b/src/ui/gui/variable-info.ui
@@ -12,7 +12,7 @@
     <child>
       <object class="GtkPaned" id="dialog-hbox2">
         <property name="visible">True</property>
-	<property name="orientation">horizontal</property>
+        <property name="orientation">horizontal</property>
         <property name="can_focus">False</property>
         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
         <child>