diff --git a/.gitignore b/.gitignore
index da86f19..7e3efe0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,4 +51,7 @@ docs/_build/
 
 # Mac stuff
 .DS_Store
-.vscode/
\ No newline at end of file
+.vscode/
+
+# Syncthing conflicts
+*.sync-conflict-*
\ No newline at end of file
diff --git a/csgui/pdfViewer.py b/csgui/pdfViewer.py
index 9f30c31..7a29928 100644
--- a/csgui/pdfViewer.py
+++ b/csgui/pdfViewer.py
@@ -28,7 +28,10 @@ class PDFLabel(QLabel):
                             parentMargins[0]*2 + scrollBarWidth
                 
             idealWidth = self.parent.width() - totalMargin
+            print(idealWidth)
             pixSize = self.pixmap().size()
+            print(pixSize)
+            print((self.parent.scrollAreaContents.size()))
             
             pixSize.scale(idealWidth, 1000000, Qt.KeepAspectRatio)
             
@@ -48,6 +51,7 @@ class PDFViewer(QScrollArea):
 
         self.scrollAreaContents.setLayout(self.scrollAreaLayout)
         self.pixmapList = []      
+        self.lastVScrollPosition = None
     
     def update_pdf(self, pdf):
         self.render(pdf)
@@ -62,9 +66,11 @@ class PDFViewer(QScrollArea):
         self.pixmapList = []
         pdfView = fitz.Document(stream=pdf, filetype='pdf')
         for page in pdfView:
-            self.pixmapList.append(page.get_pixmap(alpha=False))
+            # needs to be high enough for big monitors. 300 should do it...
+            self.pixmapList.append(page.get_pixmap(dpi=300, alpha=False))
                     
     def clear(self):
+        self.lastVScrollPosition = self.verticalScrollBar().value()
         while self.scrollAreaLayout.count():
             item = self.scrollAreaLayout.takeAt(0)
             w = item.widget()
@@ -79,4 +85,9 @@ class PDFViewer(QScrollArea):
             label.setPixmap(QPixmap.fromImage(qtimg))
             self.scrollAreaLayout.addWidget(label)
         
-        # self.scrollAreaLayout.addStretch(1)
+        self.scrollAreaLayout.addStretch(1)
+        
+        # Somewhat of a hack. Should really replace pixmaps in place
+        # rather than removing labels elsewhere in code.
+        if self.lastVScrollPosition:
+            self.verticalScrollBar().setValue(self.lastVScrollPosition)
diff --git a/ui/psetup.ui b/ui/psetup.ui
index 75ec37d..4a2f147 100644
--- a/ui/psetup.ui
+++ b/ui/psetup.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>257</width>
-    <height>271</height>
+    <width>210</width>
+    <height>334</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -37,8 +37,8 @@
      <property name="spacing">
       <number>6</number>
      </property>
-     <item row="11" column="0">
-      <widget class="QLabel" name="lineSpacingLabel">
+     <item row="12" column="0">
+      <widget class="QLabel" name="beatWidthLabel">
        <property name="minimumSize">
         <size>
          <width>0</width>
@@ -46,7 +46,7 @@
         </size>
        </property>
        <property name="text">
-        <string>Line spacing</string>
+        <string>Beat width</string>
        </property>
       </widget>
      </item>
@@ -60,19 +60,6 @@
        </property>
       </widget>
      </item>
-     <item row="10" column="0">
-      <widget class="QLabel" name="fontLabel">
-       <property name="maximumSize">
-        <size>
-         <width>40</width>
-         <height>16777215</height>
-        </size>
-       </property>
-       <property name="text">
-        <string>Font</string>
-       </property>
-      </widget>
-     </item>
      <item row="5" column="1">
       <widget class="QLineEdit" name="bottomMarginLineEdit">
        <property name="maximumSize">
@@ -83,39 +70,32 @@
        </property>
       </widget>
      </item>
-     <item row="4" column="1">
-      <widget class="QLineEdit" name="topMarginLineEdit">
-       <property name="maximumSize">
+     <item row="11" column="0">
+      <widget class="QLabel" name="lineSpacingLabel">
+       <property name="minimumSize">
         <size>
-         <width>60</width>
-         <height>16777215</height>
+         <width>0</width>
+         <height>0</height>
         </size>
        </property>
+       <property name="text">
+        <string>Line spacing</string>
+       </property>
       </widget>
      </item>
-     <item row="11" column="1">
-      <widget class="QDoubleSpinBox" name="lineSpacingDoubleSpinBox">
+     <item row="10" column="1">
+      <widget class="QCheckBox" name="includedFontCheckBox">
        <property name="minimumSize">
         <size>
-         <width>70</width>
+         <width>0</width>
          <height>0</height>
         </size>
        </property>
-       <property name="maximumSize">
-        <size>
-         <width>70</width>
-         <height>16777215</height>
-        </size>
+       <property name="text">
+        <string>FreeSans</string>
        </property>
-      </widget>
-     </item>
-     <item row="3" column="1">
-      <widget class="QLineEdit" name="rightMarginLineEdit">
-       <property name="maximumSize">
-        <size>
-         <width>60</width>
-         <height>16777215</height>
-        </size>
+       <property name="checked">
+        <bool>true</bool>
        </property>
       </widget>
      </item>
@@ -135,22 +115,33 @@
        </property>
       </widget>
      </item>
-     <item row="4" column="0">
-      <widget class="QLabel" name="topMarginLabel">
-       <property name="minimumSize">
+     <item row="1" column="0">
+      <widget class="QLabel" name="documentUnitsLabel">
+       <property name="text">
+        <string>Units</string>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="1">
+      <widget class="QLineEdit" name="topMarginLineEdit">
+       <property name="maximumSize">
         <size>
-         <width>0</width>
-         <height>0</height>
+         <width>60</width>
+         <height>16777215</height>
         </size>
        </property>
-       <property name="maximumSize">
+      </widget>
+     </item>
+     <item row="5" column="0">
+      <widget class="QLabel" name="bottomMarginLabel">
+       <property name="minimumSize">
         <size>
-         <width>16777215</width>
-         <height>16777194</height>
+         <width>0</width>
+         <height>0</height>
         </size>
        </property>
        <property name="text">
-        <string>Top margin</string>
+        <string>Bottom margin</string>
        </property>
       </widget>
      </item>
@@ -171,15 +162,8 @@
        </property>
       </widget>
      </item>
-     <item row="1" column="0">
-      <widget class="QLabel" name="documentUnitsLabel">
-       <property name="text">
-        <string>Units</string>
-       </property>
-      </widget>
-     </item>
-     <item row="5" column="0">
-      <widget class="QLabel" name="bottomMarginLabel">
+     <item row="3" column="0">
+      <widget class="QLabel" name="rightMarginLabel">
        <property name="minimumSize">
         <size>
          <width>0</width>
@@ -187,25 +171,38 @@
         </size>
        </property>
        <property name="text">
-        <string>Bottom margin</string>
+        <string>Right margin</string>
        </property>
       </widget>
      </item>
-     <item row="2" column="0">
-      <widget class="QLabel" name="leftMarginLabel">
+     <item row="3" column="1">
+      <widget class="QLineEdit" name="rightMarginLineEdit">
+       <property name="maximumSize">
+        <size>
+         <width>60</width>
+         <height>16777215</height>
+        </size>
+       </property>
+      </widget>
+     </item>
+     <item row="11" column="1">
+      <widget class="QDoubleSpinBox" name="lineSpacingDoubleSpinBox">
        <property name="minimumSize">
         <size>
-         <width>0</width>
+         <width>70</width>
          <height>0</height>
         </size>
        </property>
-       <property name="text">
-        <string>Left margin</string>
+       <property name="maximumSize">
+        <size>
+         <width>70</width>
+         <height>16777215</height>
+        </size>
        </property>
       </widget>
      </item>
-     <item row="10" column="1">
-      <widget class="QCheckBox" name="includedFontCheckBox">
+     <item row="2" column="0">
+      <widget class="QLabel" name="leftMarginLabel">
        <property name="minimumSize">
         <size>
          <width>0</width>
@@ -213,36 +210,39 @@
         </size>
        </property>
        <property name="text">
-        <string>Use FreeSans</string>
-       </property>
-       <property name="checked">
-        <bool>true</bool>
+        <string>Left margin</string>
        </property>
       </widget>
      </item>
-     <item row="12" column="0">
-      <widget class="QLabel" name="beatWidthLabel">
-       <property name="minimumSize">
+     <item row="10" column="0">
+      <widget class="QLabel" name="fontLabel">
+       <property name="maximumSize">
         <size>
-         <width>0</width>
-         <height>0</height>
+         <width>40</width>
+         <height>16777215</height>
         </size>
        </property>
        <property name="text">
-        <string>Beat width</string>
+        <string>Font</string>
        </property>
       </widget>
      </item>
-     <item row="3" column="0">
-      <widget class="QLabel" name="rightMarginLabel">
+     <item row="4" column="0">
+      <widget class="QLabel" name="topMarginLabel">
        <property name="minimumSize">
         <size>
          <width>0</width>
          <height>0</height>
         </size>
        </property>
+       <property name="maximumSize">
+        <size>
+         <width>16777215</width>
+         <height>16777194</height>
+        </size>
+       </property>
        <property name="text">
-        <string>Right margin</string>
+        <string>Top margin</string>
        </property>
       </widget>
      </item>
@@ -267,12 +267,27 @@
      </item>
      <item row="6" column="0" colspan="2">
       <widget class="QFontComboBox" name="fontComboBox">
+       <property name="minimumSize">
+        <size>
+         <width>150</width>
+         <height>0</height>
+        </size>
+       </property>
        <property name="maximumSize">
         <size>
          <width>16777215</width>
          <height>26</height>
         </size>
        </property>
+       <property name="maxVisibleItems">
+        <number>12</number>
+       </property>
+       <property name="sizeAdjustPolicy">
+        <enum>QComboBox::AdjustToContents</enum>
+       </property>
+       <property name="frame">
+        <bool>true</bool>
+       </property>
       </widget>
      </item>
     </layout>