diff --git a/Traktable.xcodeproj/project.xcworkspace/xcuserdata/johan.xcuserdatad/UserInterfaceState.xcuserstate b/Traktable.xcodeproj/project.xcworkspace/xcuserdata/johan.xcuserdatad/UserInterfaceState.xcuserstate
index 6438e18..6b7abf9 100644
Binary files a/Traktable.xcodeproj/project.xcworkspace/xcuserdata/johan.xcuserdatad/UserInterfaceState.xcuserstate and b/Traktable.xcodeproj/project.xcworkspace/xcuserdata/johan.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/Traktable/ITLibrary.m b/Traktable/ITLibrary.m
index e163c17..54acdb5 100644
--- a/Traktable/ITLibrary.m
+++ b/Traktable/ITLibrary.m
@@ -19,10 +19,6 @@ @interface ITLibrary()
 
 - (id)init;
 - (void)checkTracks:(NSArray *)tracks;
-<<<<<<< HEAD
-=======
-- (void)createDir:(NSString *)dir;
->>>>>>> 36d3320923f18ac9a8d3e894293a6ad9602a8cdb
 
 @property dispatch_queue_t queue;
 @property dispatch_group_t dispatchGroup;
@@ -32,10 +28,6 @@ - (void)createDir:(NSString *)dir;
 @implementation ITLibrary
 
 @synthesize iTunesBridge;
-<<<<<<< HEAD
-=======
-@synthesize dbQueue=_dbQueue;
->>>>>>> 36d3320923f18ac9a8d3e894293a6ad9602a8cdb
 @synthesize dbFilePath;
 @synthesize firstImport;
 
@@ -44,19 +36,7 @@ - (id)init {
     self = [super init];
 	if (self) {
         
-<<<<<<< HEAD
         iTunesBridge = [SBApplication applicationWithBundleIdentifier:@"com.apple.iTunes"];
-=======
-        [self resetDb];
-    }
-    
-    _dbQueue = [FMDatabaseQueue databaseQueueWithPath:dbFilePath];
-    _queue = dispatch_queue_create("traktable.sync.queue", NULL);
-    _dispatchGroup = dispatch_group_create();
-    
-    [self.dbQueue inDatabase:^(FMDatabase *db) {
-        FMResultSet *s = [db executeQuery:@"SELECT playedCount FROM library"];
->>>>>>> 36d3320923f18ac9a8d3e894293a6ad9602a8cdb
         
         NSString *appSupportPath = [ITConstants applicationSupportFolder];
         [ITUtil createDir:appSupportPath];
diff --git a/Traktable/QueueViewController.xib b/Traktable/QueueViewController.xib
index 7f058c4..691949e 100644
--- a/Traktable/QueueViewController.xib
+++ b/Traktable/QueueViewController.xib
@@ -18,14 +18,14 @@
             <rect key="frame" x="0.0" y="0.0" width="660" height="571"/>
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
-                <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="17" horizontalPageScroll="10" verticalLineScroll="17" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="smw-bv-hho">
+                <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="50" horizontalPageScroll="10" verticalLineScroll="50" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="smw-bv-hho">
                     <rect key="frame" x="0.0" y="0.0" width="660" height="571"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="xm8-K2-lmu">
                         <rect key="frame" x="0.0" y="0.0" width="660" height="571"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnReordering="NO" columnSelection="YES" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" rowSizeStyle="automatic" viewBased="YES" id="Igt-XU-HfX">
+                            <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnReordering="NO" columnSelection="YES" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" rowHeight="50" rowSizeStyle="automatic" viewBased="YES" id="Igt-XU-HfX">
                                 <rect key="frame" x="0.0" y="0.0" width="660" height="571"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
@@ -48,8 +48,8 @@
                                                 <rect key="frame" x="0.0" y="0.0" width="660" height="50"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="x9O-BC-vVA">
-                                                        <rect key="frame" x="51" y="3" width="568" height="33"/>
+                                                    <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="x9O-BC-vVA">
+                                                        <rect key="frame" x="52" y="3" width="566" height="33"/>
                                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" placeholderString="Queued item" id="BHt-76-fhW">
                                                             <font key="font" size="12" name="HelveticaNeue"/>
@@ -65,8 +65,8 @@
                                                         </constraints>
                                                         <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="cNN-hX-vAX"/>
                                                     </imageView>
-                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="DCy-DI-2lF">
-                                                        <rect key="frame" x="493" y="17" width="126" height="17"/>
+                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="DCy-DI-2lF">
+                                                        <rect key="frame" x="494" y="17" width="124" height="17"/>
                                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                         <constraints>
                                                             <constraint firstAttribute="width" constant="120" id="bbZ-rb-3lx"/>