diff --git a/autotagstartwindow.ui b/autotagstartwindow.ui
index 953a00b..2ddb8e9 100644
--- a/autotagstartwindow.ui
+++ b/autotagstartwindow.ui
@@ -9,10 +9,16 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>602</width>
-    <height>412</height>
+    <width>607</width>
+    <height>319</height>
    </rect>
   </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
   <property name="windowTitle">
    <string>Auto-Tag</string>
   </property>
@@ -40,13 +46,16 @@
      </item>
      <item>
       <layout class="QFormLayout" name="formLayout">
+       <property name="sizeConstraint">
+        <enum>QLayout::SetFixedSize</enum>
+       </property>
        <property name="fieldGrowthPolicy">
         <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
        </property>
        <item row="0" column="0" colspan="2">
         <widget class="QCheckBox" name="cbxSaveOnLowConfidence">
          <property name="sizePolicy">
-          <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
@@ -58,6 +67,12 @@
        </item>
        <item row="1" column="0" colspan="2">
         <widget class="QCheckBox" name="cbxDontUseYear">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="text">
           <string>Don't use publication year in indentification process</string>
          </property>
@@ -65,6 +80,12 @@
        </item>
        <item row="2" column="0" colspan="2">
         <widget class="QCheckBox" name="cbxAssumeIssueOne">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="text">
           <string>If no issue number, assume &quot;1&quot;</string>
          </property>
@@ -72,6 +93,12 @@
        </item>
        <item row="3" column="0" colspan="2">
         <widget class="QCheckBox" name="cbxIgnoreLeadingDigitsInFilename">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="text">
           <string>Ignore leading (sequence) numbers in filename</string>
          </property>
@@ -79,6 +106,12 @@
        </item>
        <item row="4" column="0" colspan="2">
         <widget class="QCheckBox" name="cbxRemoveAfterSuccess">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="text">
           <string>Remove archives from list after successful tagging</string>
          </property>
@@ -86,6 +119,12 @@
        </item>
        <item row="5" column="0" colspan="2">
         <widget class="QCheckBox" name="cbxSpecifySearchString">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="text">
           <string>Specify series search string for all selected archives</string>
          </property>
@@ -93,6 +132,12 @@
        </item>
        <item row="6" column="0">
         <widget class="QLabel" name="label_2">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="minimumSize">
           <size>
            <width>40</width>
@@ -100,15 +145,28 @@
           </size>
          </property>
          <property name="text">
-          <string>  </string>
+          <string/>
          </property>
         </widget>
        </item>
        <item row="6" column="1">
-        <widget class="QLineEdit" name="leSearchString"/>
+        <widget class="QLineEdit" name="leSearchString">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+        </widget>
        </item>
        <item row="8" column="1">
         <widget class="QLineEdit" name="leNameLengthMatchTolerance">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="maximumSize">
           <size>
            <width>50</width>
@@ -119,6 +177,12 @@
        </item>
        <item row="7" column="0" colspan="2">
         <widget class="QLabel" name="label_3">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="text">
           <string>Adjust Name Length Match Tolerance:</string>
          </property>
diff --git a/exportwindow.ui b/exportwindow.ui
index 647babd..50940f7 100644
--- a/exportwindow.ui
+++ b/exportwindow.ui
@@ -9,18 +9,24 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>515</width>
-    <height>320</height>
+    <width>533</width>
+    <height>202</height>
    </rect>
   </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
   <property name="windowTitle">
    <string>Export to Zip Archive</string>
   </property>
   <property name="modal">
    <bool>false</bool>
   </property>
-  <layout class="QGridLayout" name="gridLayout_3">
-   <item row="0" column="0">
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <item>
     <layout class="QVBoxLayout" name="verticalLayout">
      <item>
       <widget class="QLabel" name="label">
diff --git a/taggerwindow.py b/taggerwindow.py
index e6a6ada..3a3ccae 100644
--- a/taggerwindow.py
+++ b/taggerwindow.py
@@ -123,13 +123,6 @@ class TaggerWindow( QtGui.QMainWindow):
 		#self.splitter.setHandleWidth(0)
 		#self.splitter.handle(1).setDisabled(True)
 
-		# This is ugly, and should probably be done in a resource file
-		if platform.system() == "Linux":
-			self.scrollAreaWidgetContents.resize( self.scrollAreaWidgetContents.width(), 630)
-		#if platform.system() == "Darwin":
-		#	self.scrollAreaWidgetContents.resize( 550, self.scrollAreaWidgetContents.height())
-
-
 		# we can't specify relative font sizes in the UI designer, so
 		# walk through all the lablels in the main form, and make them
 		# a smidge smaller
@@ -141,8 +134,8 @@ class TaggerWindow( QtGui.QMainWindow):
 				f.setItalic( True )
 				child.setFont( f )
 						
-		#---------------------------		
 
+		self.scrollAreaWidgetContents.adjustSize()
 		
 		self.setWindowIcon(QtGui.QIcon(os.path.join(ComicTaggerSettings.baseDir(), 'graphics/app.png' )))
 		
@@ -202,6 +195,9 @@ class TaggerWindow( QtGui.QMainWindow):
 			self.splitter.setSizes([ self.settings.last_form_side_width , self.settings.last_list_side_width])
 		self.raise_()
 		QtCore.QCoreApplication.processEvents()
+		self.resizeEvent( None )
+
+		self.splitter.splitterMoved.connect( self.splitterMovedEvent )
 
 		self.fileSelectionList.addAppAction( self.actionAutoIdentify )
 		self.fileSelectionList.addAppAction( self.actionAutoTag )
@@ -391,6 +387,7 @@ class TaggerWindow( QtGui.QMainWindow):
 		if rar_count != 0:
 			dlg = ExportWindow( self, self.settings,
 						self.tr("You have selected {0} archive(s) to export  to Zip format.  New archives will be created in the same folder as the original.\n\nPlease choose options below, and select OK.\n".format(rar_count) ))
+			dlg.adjustSize( )
 			dlg.setModal( True )
 			if not dlg.exec_():
 				return
@@ -1661,6 +1658,7 @@ class TaggerWindow( QtGui.QMainWindow):
 		atstartdlg = AutoTagStartWindow( self, self.settings,
 					self.tr("You have selected {0} archive(s) to automatically identify and write {1} tags to.\n\n".format(len(ca_list), MetaDataStyle.name[style]) +
 							"Please choose options below, and select OK to Auto-Tag.\n" ))
+		atstartdlg.adjustSize( )
 		atstartdlg.setModal( True )
 		if not atstartdlg.exec_():
 			return
@@ -1856,4 +1854,16 @@ class TaggerWindow( QtGui.QMainWindow):
 		self.actualLoadCurrentArchive()
 	
 	def fileListCleared( self ):
-		self.resetApp()
\ No newline at end of file
+		self.resetApp()
+
+	def splitterMovedEvent( self, w1, w2 ):
+		scrollbar_w = 0
+		if self.scrollArea.verticalScrollBar().isVisible():
+			scrollbar_w = self.scrollArea.verticalScrollBar().width()
+		
+		new_w = self.scrollArea.width() - scrollbar_w - 3
+		self.scrollAreaWidgetContents.resize( new_w, self.scrollAreaWidgetContents.height())
+
+	def resizeEvent( self, ev ):
+		self.splitterMovedEvent( 0, 0)
+
diff --git a/taggerwindow.ui b/taggerwindow.ui
index 0ff6a54..57df51f 100644
--- a/taggerwindow.ui
+++ b/taggerwindow.ui
@@ -301,13 +301,13 @@
                  <property name="geometry">
                   <rect>
                    <x>0</x>
-                   <y>-64</y>
+                   <y>0</y>
                    <width>470</width>
                    <height>520</height>
                   </rect>
                  </property>
                  <property name="sizePolicy">
-                  <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+                  <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
                    <horstretch>0</horstretch>
                    <verstretch>0</verstretch>
                   </sizepolicy>
@@ -1107,7 +1107,7 @@
      <x>0</x>
      <y>0</y>
      <width>1096</width>
-     <height>25</height>
+     <height>21</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuComicTagger">