diff --git a/Persephone/Controllers/QueueViewController.swift b/Persephone/Controllers/QueueViewController.swift
index 518109f..db9d275 100644
--- a/Persephone/Controllers/QueueViewController.swift
+++ b/Persephone/Controllers/QueueViewController.swift
@@ -22,7 +22,6 @@ class QueueViewController: NSViewController {
       $0.select { $0.queueState }
     }
 
-//    queueView.dataSource = dataSource
     queueView.columnAutoresizingStyle = .sequentialColumnAutoresizingStyle
     queueView.registerForDraggedTypes([REORDER_PASTEBOARD_TYPE])
     queueView.draggingDestinationFeedbackStyle = .regular
diff --git a/Persephone/DataSources/QueueDataSource.swift b/Persephone/DataSources/QueueDataSource.swift
index 2298e1f..4649ae7 100644
--- a/Persephone/DataSources/QueueDataSource.swift
+++ b/Persephone/DataSources/QueueDataSource.swift
@@ -45,17 +45,26 @@ class QueueDataSource: NSObject, NSOutlineViewDataSource {
     guard let queueItem = item as? QueueItem
       else { return nil }
 
-    let pbItem = NSPasteboardItem()
+    let pasteboardItem = NSPasteboardItem()
 
-    pbItem.setPropertyList(["queuePos": queueItem.queuePos], forType: REORDER_PASTEBOARD_TYPE)
+    pasteboardItem.setPropertyList(["queuePos": queueItem.queuePos], forType: REORDER_PASTEBOARD_TYPE)
 
-    return pbItem
+    return pasteboardItem
   }
 
   func outlineView(_ outlineView: NSOutlineView, validateDrop info: NSDraggingInfo, proposedItem item: Any?, proposedChildIndex index: Int) -> NSDragOperation {
+    var newQueuePos = index - 1
+
     guard let draggingTypes = info.draggingPasteboard.types,
       draggingTypes.contains(REORDER_PASTEBOARD_TYPE),
-      index >= 0
+      let payload = info.draggingPasteboard.propertyList(forType: REORDER_PASTEBOARD_TYPE) as? [String: Int],
+      let queuePos = payload["queuePos"],
+      newQueuePos >= 0
+      else { return [] }
+
+    if newQueuePos > queuePos { newQueuePos -= 1 }
+
+    guard queuePos != newQueuePos
       else { return [] }
 
     return .move
@@ -70,7 +79,8 @@ class QueueDataSource: NSObject, NSOutlineViewDataSource {
 
     if newQueuePos > queuePos { newQueuePos -= 1 }
 
-    guard queuePos != newQueuePos else { return false }
+    guard queuePos != newQueuePos
+      else { return false }
 
     App.store.dispatch(MPDMoveSongInQueue(oldQueuePos: queuePos, newQueuePos: newQueuePos))
 
diff --git a/Persephone/Models/QueueItem.swift b/Persephone/Models/QueueItem.swift
index c048510..8a98214 100644
--- a/Persephone/Models/QueueItem.swift
+++ b/Persephone/Models/QueueItem.swift
@@ -8,8 +8,14 @@
 
 import AppKit
 
-struct QueueItem: Equatable {
+struct QueueItem: Hashable {
   var song: Song
   var queuePos: Int
   var isPlaying: Bool
+
+  func hash(into hasher: inout Hasher) {
+    hasher.combine(song)
+    hasher.combine(queuePos)
+    hasher.combine(isPlaying)
+  }
 }
diff --git a/Persephone/Models/Song.swift b/Persephone/Models/Song.swift
index 5b0a2a8..0d283fe 100644
--- a/Persephone/Models/Song.swift
+++ b/Persephone/Models/Song.swift
@@ -43,3 +43,13 @@ extension Song: Equatable {
       (lhs.album == rhs.album)
   }
 }
+
+extension Song: Hashable {
+  func hash(into hasher: inout Hasher) {
+    hasher.combine(mpdSong.uriString)
+    hasher.combine(trackNumber)
+    hasher.combine(title)
+    hasher.combine(artist)
+    hasher.combine(album.title)
+  }
+}
diff --git a/Persephone/Resources/Base.lproj/Main.storyboard b/Persephone/Resources/Base.lproj/Main.storyboard
index a2c4322..3263598 100644
--- a/Persephone/Resources/Base.lproj/Main.storyboard
+++ b/Persephone/Resources/Base.lproj/Main.storyboard
@@ -578,17 +578,17 @@
                         <rect key="frame" x="0.0" y="0.0" width="328" height="548"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <subviews>
-                            <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="S3o-nF-NN7">
+                            <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="22" horizontalPageScroll="10" verticalLineScroll="22" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="S3o-nF-NN7">
                                 <rect key="frame" x="0.0" y="0.0" width="328" height="219"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                 <clipView key="contentView" drawsBackground="NO" id="WI8-Pw-03L">
                                     <rect key="frame" x="0.0" y="0.0" width="328" height="219"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
-                                        <outlineView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" selectionHighlightStyle="sourceList" multipleSelection="NO" autosaveColumns="NO" rowSizeStyle="automatic" viewBased="YES" indentationPerLevel="16" outlineTableColumn="0Co-uF-CCB" id="jEJ-jg-fll" customClass="QueueView" customModule="Persephone" customModuleProvider="target">
+                                        <outlineView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" selectionHighlightStyle="sourceList" multipleSelection="NO" autosaveColumns="NO" rowHeight="22" rowSizeStyle="automatic" viewBased="YES" indentationPerLevel="14" outlineTableColumn="0Co-uF-CCB" id="jEJ-jg-fll" customClass="QueueView" customModule="Persephone" customModuleProvider="target">
                                             <rect key="frame" x="0.0" y="0.0" width="328" height="219"/>
                                             <autoresizingMask key="autoresizingMask"/>
-                                            <size key="intercellSpacing" width="3" height="2"/>
+                                            <size key="intercellSpacing" width="3" height="0.0"/>
                                             <color key="backgroundColor" name="_sourceListBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                             <tableColumns>
@@ -606,7 +606,7 @@
                                                     <tableColumnResizingMask key="resizingMask" resizeWithTable="YES"/>
                                                     <prototypeCellViews>
                                                         <tableCellView identifier="queueHeadingCell" id="GOd-cg-juD">
-                                                            <rect key="frame" x="1" y="1" width="200" height="17"/>
+                                                            <rect key="frame" x="1" y="0.0" width="200" height="17"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <subviews>
                                                                 <textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="xgd-Cz-np3">
@@ -627,7 +627,7 @@
                                                             </constraints>
                                                         </tableCellView>
                                                         <tableCellView identifier="songTitleCell" id="5rR-Gz-AcP" customClass="QueueSongTitleView" customModule="Persephone" customModuleProvider="target">
-                                                            <rect key="frame" x="1" y="20" width="200" height="17"/>
+                                                            <rect key="frame" x="1" y="17" width="200" height="17"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <subviews>
                                                                 <imageView identifier="queuePlayerState" translatesAutoresizingMaskIntoConstraints="NO" id="o8i-cz-hIP" userLabel="Player State View">
@@ -687,7 +687,7 @@
                                                     <tableColumnResizingMask key="resizingMask" resizeWithTable="YES"/>
                                                     <prototypeCellViews>
                                                         <tableCellView identifier="songArtistCell" id="JSk-Vc-Y7e">
-                                                            <rect key="frame" x="204" y="1" width="122" height="17"/>
+                                                            <rect key="frame" x="204" y="0.0" width="122" height="17"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <subviews>
                                                                 <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="tBe-Q9-3Rw">