diff --git a/Mac/Components/Browser/Album Browser/AlbumViewItem.xib b/Mac/Components/Browser/Album Browser/AlbumViewItem.xib
index 5e50c56..af0b919 100644
--- a/Mac/Components/Browser/Album Browser/AlbumViewItem.xib	
+++ b/Mac/Components/Browser/Album Browser/AlbumViewItem.xib	
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17506" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17506"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17701"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -33,7 +33,7 @@
                                     <size key="offset" width="0.0" height="2"/>
                                     <color key="color" white="0.0" alpha="0.34603323063380281" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 </shadow>
-                                <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="defaultCoverArt" imagePosition="only" alignment="center" lineBreakMode="truncatingTail" refusesFirstResponder="YES" state="on" transparent="YES" imageScaling="proportionallyUpOrDown" inset="2" id="t8A-Hz-L38">
+                                <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="defaultCoverArt" imagePosition="only" alignment="center" lineBreakMode="truncatingTail" refusesFirstResponder="YES" state="on" imageScaling="proportionallyUpOrDown" inset="2" id="t8A-Hz-L38">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
                                 </buttonCell>
diff --git a/Mac/Components/Queue/QueueViewController+NSOutlineViewDelegate.swift b/Mac/Components/Queue/QueueViewController+NSOutlineViewDelegate.swift
index 31d0719..b5e1736 100644
--- a/Mac/Components/Queue/QueueViewController+NSOutlineViewDelegate.swift
+++ b/Mac/Components/Queue/QueueViewController+NSOutlineViewDelegate.swift
@@ -25,6 +25,10 @@ extension QueueViewController: NSOutlineViewDelegate {
       return nil
     }
   }
+    
+  func outlineView(_ outlineView: NSOutlineView, heightOfRowByItem item: Any) -> CGFloat {
+    return 40
+  }
 
   func outlineViewSelectionDidChange(_ notification: Notification) {
     let queueItem = dataSource.queue[queueView.selectedRow]
diff --git a/Mac/Components/Window/Base.lproj/Main.storyboard b/Mac/Components/Window/Base.lproj/Main.storyboard
index 4ab71d9..90f4fa5 100644
--- a/Mac/Components/Window/Base.lproj/Main.storyboard
+++ b/Mac/Components/Window/Base.lproj/Main.storyboard
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="17506" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17506"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17701"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -295,8 +295,8 @@
                                 <toolbarItem implicitItemIdentifier="2D01DD0F-DDD1-411E-9270-20E2B5B07FC2" label="Controls" paletteLabel="Controls" sizingBehavior="auto" id="p3r-ty-Pxf">
                                     <nil key="toolTip"/>
                                     <segmentedControl key="view" verticalHuggingPriority="750" id="Bbf-C6-1Gu">
-                                        <rect key="frame" x="0.0" y="14" width="153" height="24"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                        <rect key="frame" x="0.0" y="14" width="165" height="23"/>
+                                        <autoresizingMask key="autoresizingMask"/>
                                         <segmentedCell key="cell" borderStyle="border" alignment="left" style="texturedRounded" trackingMode="momentary" id="EBk-sD-nG7">
                                             <font key="font" metaFont="system"/>
                                             <segments>
@@ -357,10 +357,10 @@
                                     <nil key="toolTip"/>
                                     <progressIndicator key="view" identifier="databaseUpdatingIndicator" wantsLayer="YES" horizontalHuggingPriority="750" verticalHuggingPriority="750" maxValue="100" displayedWhenStopped="NO" bezeled="NO" indeterminate="YES" controlSize="small" style="spinning" id="LpV-iM-o6t">
                                         <rect key="frame" x="0.0" y="14" width="16" height="16"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                        <autoresizingMask key="autoresizingMask"/>
                                     </progressIndicator>
                                 </toolbarItem>
-                                <toolbarItem implicitItemIdentifier="A07933B6-4770-4B28-856B-B98DB5C6EB55" label="" paletteLabel="Shuffle" image="shuffleButton" selectable="YES" id="gF4-mh-Nzd">
+                                <toolbarItem implicitItemIdentifier="A07933B6-4770-4B28-856B-B98DB5C6EB55" label="" paletteLabel="Shuffle" image="shuffleButton" id="gF4-mh-Nzd">
                                     <nil key="toolTip"/>
                                     <size key="minSize" width="42" height="24"/>
                                     <size key="maxSize" width="42" height="24"/>
@@ -396,7 +396,7 @@
                                     <nil key="toolTip"/>
                                     <searchField key="view" wantsLayer="YES" verticalHuggingPriority="750" textCompletion="NO" id="xfU-Xe-eno">
                                         <rect key="frame" x="0.0" y="14" width="96" height="22"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                        <autoresizingMask key="autoresizingMask"/>
                                         <searchFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" borderStyle="bezel" usesSingleLineMode="YES" bezelStyle="round" id="F3N-3P-tS3">
                                             <font key="font" metaFont="system"/>
                                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -410,8 +410,8 @@
                                 <toolbarItem implicitItemIdentifier="01E8DA80-2BDE-49F9-B311-69876CF0AE8E" label="Volume" paletteLabel="Volume" image="speakerHigh" sizingBehavior="auto" id="cMg-Mj-j7q">
                                     <nil key="toolTip"/>
                                     <button key="view" verticalHuggingPriority="750" id="cfN-LI-Cab">
-                                        <rect key="frame" x="2" y="14" width="42" height="24"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                        <rect key="frame" x="7" y="14" width="33" height="23"/>
+                                        <autoresizingMask key="autoresizingMask"/>
                                         <buttonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="speakerHigh" imagePosition="overlaps" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="bJh-X9-7q0">
                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                             <font key="font" metaFont="system"/>
@@ -536,11 +536,11 @@
             <objects>
                 <viewController title="Cover Art" id="3C9-vU-zjZ" userLabel="Cover Art" customClass="CoverArtPrefsController" customModule="Persephone" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" id="PyK-v2-kus">
-                        <rect key="frame" x="0.0" y="0.0" width="427" height="95"/>
+                        <rect key="frame" x="0.0" y="0.0" width="433" height="96"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <subviews>
                             <gridView horizontalHuggingPriority="750" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="250" xPlacement="leading" yPlacement="center" rowAlignment="none" rowSpacing="14" translatesAutoresizingMaskIntoConstraints="NO" id="M8L-ne-ZhL">
-                                <rect key="frame" x="0.0" y="0.0" width="427" height="95"/>
+                                <rect key="frame" x="0.0" y="0.0" width="433" height="96"/>
                                 <rows>
                                     <gridRow topPadding="20" id="jo0-w7-CZu"/>
                                     <gridRow bottomPadding="26" id="g4x-Bc-qT7"/>
@@ -551,7 +551,7 @@
                                 <gridCells>
                                     <gridCell row="jo0-w7-CZu" column="y6E-R8-zfP" id="NAC-x2-Qyh">
                                         <button key="contentView" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="pRL-MG-1Be">
-                                            <rect key="frame" x="78" y="59" width="271" height="18"/>
+                                            <rect key="frame" x="78" y="59" width="275" height="18"/>
                                             <buttonCell key="cell" type="check" title="Fetch missing artwork from MusicBrainz" bezelStyle="regularSquare" imagePosition="left" enabled="NO" inset="2" id="LpD-Ew-HMd">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                 <font key="font" metaFont="system"/>
@@ -563,7 +563,7 @@
                                     </gridCell>
                                     <gridCell row="g4x-Bc-qT7" column="y6E-R8-zfP" id="LTx-vQ-fTR">
                                         <button key="contentView" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="mXh-kY-tMC">
-                                            <rect key="frame" x="74" y="19" width="279" height="32"/>
+                                            <rect key="frame" x="73" y="19" width="287" height="32"/>
                                             <buttonCell key="cell" type="push" title="Clear album art cache..." bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="l81-SG-7mf">
                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                 <font key="font" metaFont="system"/>
@@ -689,18 +689,18 @@
             <objects>
                 <viewController id="KIP-rq-4dM" customClass="QueueViewController" customModule="Persephone" customModuleProvider="target" sceneMemberID="viewController">
                     <splitView key="view" dividerStyle="thin" id="84I-w3-Mxl">
-                        <rect key="frame" x="0.0" y="0.0" width="329" height="528"/>
+                        <rect key="frame" x="0.0" y="0.0" width="324" height="521"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <subviews>
-                            <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="42" horizontalPageScroll="10" verticalLineScroll="42" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="S3o-nF-NN7">
-                                <rect key="frame" x="0.0" y="0.0" width="329" height="198"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxY="YES"/>
+                            <scrollView misplaced="YES" borderType="none" autohidesScrollers="YES" horizontalLineScroll="17" horizontalPageScroll="10" verticalLineScroll="17" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="S3o-nF-NN7">
+                                <rect key="frame" x="0.0" y="0.0" width="324" height="211"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <clipView key="contentView" drawsBackground="NO" id="WI8-Pw-03L">
-                                    <rect key="frame" x="0.0" y="0.0" width="329" height="198"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="324" height="211"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
-                                        <outlineView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" selectionHighlightStyle="sourceList" multipleSelection="NO" autosaveColumns="NO" rowHeight="42" rowSizeStyle="automatic" viewBased="YES" indentationMarkerFollowsCell="NO" outlineTableColumn="0Co-uF-CCB" id="jEJ-jg-fll">
-                                            <rect key="frame" x="0.0" y="0.0" width="329" height="198"/>
+                                        <outlineView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" selectionHighlightStyle="sourceList" multipleSelection="NO" autosaveColumns="NO" rowSizeStyle="automatic" viewBased="YES" indentationMarkerFollowsCell="NO" outlineTableColumn="0Co-uF-CCB" id="jEJ-jg-fll">
+                                            <rect key="frame" x="0.0" y="0.0" width="324" height="211"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <size key="intercellSpacing" width="3" height="0.0"/>
                                             <color key="backgroundColor" name="_sourceListBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -718,12 +718,12 @@
                                                     </textFieldCell>
                                                     <tableColumnResizingMask key="resizingMask" resizeWithTable="YES"/>
                                                     <prototypeCellViews>
-                                                        <tableCellView identifier="songCoverCell" id="5rR-Gz-AcP" userLabel="Song Cover View" customClass="QueueSongCoverView" customModule="Persephone" customModuleProvider="target">
-                                                            <rect key="frame" x="1" y="0.0" width="43" height="42"/>
+                                                        <tableCellView identifier="songCoverCell" misplaced="YES" id="5rR-Gz-AcP" userLabel="Song Cover View" customClass="QueueSongCoverView" customModule="Persephone" customModuleProvider="target">
+                                                            <rect key="frame" x="11" y="0.0" width="48" height="15"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <subviews>
-                                                                <imageView identifier="songCoverView" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="7Yi-vi-Frs" userLabel="Song Cover View">
-                                                                    <rect key="frame" x="9" y="5" width="32" height="32"/>
+                                                                <imageView identifier="songCoverView" wantsLayer="YES" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="7Yi-vi-Frs" userLabel="Song Cover View">
+                                                                    <rect key="frame" x="14" y="4" width="32" height="32"/>
                                                                     <constraints>
                                                                         <constraint firstAttribute="width" constant="32" id="hhe-Vq-2aS"/>
                                                                         <constraint firstAttribute="height" constant="32" id="iz9-3T-uWZ"/>
@@ -731,12 +731,18 @@
                                                                     <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="defaultCoverArt" id="KfD-57-Whk"/>
                                                                     <color key="contentTintColor" name="quaternaryLabelColor" catalog="System" colorSpace="catalog"/>
                                                                 </imageView>
-                                                                <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="ceF-G3-pG5">
-                                                                    <rect key="frame" x="9" y="5" width="32" height="32"/>
+                                                                <imageView wantsLayer="YES" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="ceF-G3-pG5">
+                                                                    <rect key="frame" x="14" y="4" width="32" height="32"/>
+                                                                    <constraints>
+                                                                        <constraint firstAttribute="width" constant="32" id="674-SH-mEv"/>
+                                                                        <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="32" id="D4H-VP-xaW"/>
+                                                                    </constraints>
                                                                     <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="a8D-O7-eZ5"/>
                                                                 </imageView>
                                                             </subviews>
                                                             <constraints>
+                                                                <constraint firstAttribute="bottom" secondItem="ceF-G3-pG5" secondAttribute="bottom" constant="4" id="2K4-5i-8Fb"/>
+                                                                <constraint firstItem="ceF-G3-pG5" firstAttribute="top" secondItem="5rR-Gz-AcP" secondAttribute="top" constant="4" id="73a-5Q-EIQ"/>
                                                                 <constraint firstItem="ceF-G3-pG5" firstAttribute="trailing" secondItem="7Yi-vi-Frs" secondAttribute="trailing" id="7xV-J1-YZK"/>
                                                                 <constraint firstItem="ceF-G3-pG5" firstAttribute="bottom" secondItem="7Yi-vi-Frs" secondAttribute="bottom" id="8qA-ho-KZI"/>
                                                                 <constraint firstItem="ceF-G3-pG5" firstAttribute="top" secondItem="7Yi-vi-Frs" secondAttribute="top" id="So1-Lk-ks3"/>
@@ -751,7 +757,7 @@
                                                         </tableCellView>
                                                     </prototypeCellViews>
                                                 </tableColumn>
-                                                <tableColumn identifier="songInfoColumn" width="219" minWidth="10" maxWidth="3.4028234663852886e+38" id="HP0-ty-PFY" userLabel="Song Info">
+                                                <tableColumn identifier="songInfoColumn" width="191" minWidth="10" maxWidth="3.4028234663852886e+38" id="HP0-ty-PFY" userLabel="Song Info">
                                                     <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
                                                         <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -764,11 +770,11 @@
                                                     <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                                     <prototypeCellViews>
                                                         <tableCellView identifier="songInfoCell" id="GuF-NF-B1t" userLabel="Song Info View" customClass="QueueSongInfoView" customModule="Persephone" customModuleProvider="target">
-                                                            <rect key="frame" x="47" y="0.0" width="219" height="42"/>
+                                                            <rect key="frame" x="62" y="0.0" width="191" height="0.0"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <subviews>
                                                                 <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="tBe-Q9-3Rw" userLabel="Song Artist View">
-                                                                    <rect key="frame" x="1" y="8" width="225" height="15"/>
+                                                                    <rect key="frame" x="1" y="-34" width="197" height="15"/>
                                                                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Song Artist" id="Ceb-ec-ydU">
                                                                         <font key="font" metaFont="cellTitle"/>
                                                                         <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
@@ -776,7 +782,7 @@
                                                                     </textFieldCell>
                                                                 </textField>
                                                                 <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="i0h-bn-auJ" userLabel="Song Title View">
-                                                                    <rect key="frame" x="1" y="23" width="217" height="16"/>
+                                                                    <rect key="frame" x="1" y="-19" width="189" height="16"/>
                                                                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Song Title" id="ei8-1e-ErK">
                                                                         <font key="font" metaFont="system"/>
                                                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -799,7 +805,7 @@
                                                         </tableCellView>
                                                     </prototypeCellViews>
                                                 </tableColumn>
-                                                <tableColumn identifier="songDurationColumn" width="58" minWidth="52" maxWidth="58" id="8O6-ox-kx2" userLabel="Duration">
+                                                <tableColumn identifier="songDurationColumn" width="52" minWidth="52" maxWidth="58" id="8O6-ox-kx2" userLabel="Duration">
                                                     <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
                                                         <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -812,11 +818,11 @@
                                                     <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                                     <prototypeCellViews>
                                                         <tableCellView identifier="songDurationCell" id="9Nz-Yf-SN1" userLabel="Song Duration View">
-                                                            <rect key="frame" x="269" y="0.0" width="58" height="42"/>
+                                                            <rect key="frame" x="256" y="0.0" width="56" height="0.0"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <subviews>
                                                                 <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="ukg-c0-XVS">
-                                                                    <rect key="frame" x="11" y="13" width="41" height="16"/>
+                                                                    <rect key="frame" x="9" y="-8" width="41" height="16"/>
                                                                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" title="88:88" id="JnJ-sF-vCP">
                                                                         <font key="font" metaFont="system"/>
                                                                         <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
@@ -850,7 +856,7 @@
                                     <constraint firstAttribute="width" relation="lessThanOrEqual" constant="500" id="zuT-k9-w8d"/>
                                 </constraints>
                                 <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="7mx-v9-DSr">
-                                    <rect key="frame" x="0.0" y="182" width="329" height="16"/>
+                                    <rect key="frame" x="0.0" y="196" width="324" height="15"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                 </scroller>
                                 <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="p5z-C0-FUJ">
@@ -858,12 +864,12 @@
                                     <autoresizingMask key="autoresizingMask"/>
                                 </scroller>
                             </scrollView>
-                            <customView id="iUb-eV-Qws">
-                                <rect key="frame" x="0.0" y="199" width="329" height="329"/>
+                            <customView misplaced="YES" id="iUb-eV-Qws">
+                                <rect key="frame" x="0.0" y="212" width="324" height="309"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <subviews>
                                     <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="Dw3-M5-tWY" customClass="CurrentCoverArtView" customModule="Persephone" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="0.0" width="329" height="329"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="324" height="324"/>
                                         <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyUpOrDown" image="defaultCoverArt" id="IoN-3N-TCb"/>
                                     </imageView>
                                 </subviews>
diff --git a/Persephone.xcodeproj/project.pbxproj b/Persephone.xcodeproj/project.pbxproj
index 63ff64e..aecf4c3 100644
--- a/Persephone.xcodeproj/project.pbxproj
+++ b/Persephone.xcodeproj/project.pbxproj
@@ -8,6 +8,8 @@
 
 /* Begin PBXBuildFile section */
 		38BAC36B249CB1A7004BAEA4 /* AlbumDetailSongTitleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38BAC36A249CB1A6004BAEA4 /* AlbumDetailSongTitleView.swift */; };
+		E403E63E246F4C3900200F58 /* NowPlayingBarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E403E63C246F4C3900200F58 /* NowPlayingBarViewController.swift */; };
+		E403E63F246F4C3900200F58 /* NowPlayingBarViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E403E63D246F4C3900200F58 /* NowPlayingBarViewController.xib */; };
 		E407861C2110CE6E006887B1 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E407861B2110CE6E006887B1 /* AppDelegate.swift */; };
 		E40786202110CE70006887B1 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E407861F2110CE70006887B1 /* Assets.xcassets */; };
 		E40786232110CE70006887B1 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E40786212110CE70006887B1 /* Main.storyboard */; };
@@ -30,6 +32,8 @@
 		E41E5309223C020400173814 /* MPDClient+Command.swift in Sources */ = {isa = PBXBuildFile; fileRef = E41E5308223C020400173814 /* MPDClient+Command.swift */; };
 		E41E530B223C033700173814 /* MPDClient+Album.swift in Sources */ = {isa = PBXBuildFile; fileRef = E41E530A223C033700173814 /* MPDClient+Album.swift */; };
 		E41EA46C221636AF0068EF46 /* GeneralPrefsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E41EA46B221636AF0068EF46 /* GeneralPrefsViewController.swift */; };
+		E4207C792576F75A0089D21B /* NowPlayingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E4207C772576F7590089D21B /* NowPlayingViewController.swift */; };
+		E4207C7A2576F75A0089D21B /* NowPlayingViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E4207C782576F75A0089D21B /* NowPlayingViewController.xib */; };
 		E4235640228623D2001216D6 /* QueueSongInfoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E423563F228623D2001216D6 /* QueueSongInfoView.swift */; };
 		E42410B62241B956005ED6DF /* MPDClient+Database.swift in Sources */ = {isa = PBXBuildFile; fileRef = E42410B52241B956005ED6DF /* MPDClient+Database.swift */; };
 		E42A4D4F22E20D7D001C6CAD /* MPDTag.swift in Sources */ = {isa = PBXBuildFile; fileRef = E42A4D4E22E20D7D001C6CAD /* MPDTag.swift */; };
@@ -370,6 +374,8 @@
 
 /* Begin PBXFileReference section */
 		38BAC36A249CB1A6004BAEA4 /* AlbumDetailSongTitleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlbumDetailSongTitleView.swift; sourceTree = "<group>"; };
+		E403E63C246F4C3900200F58 /* NowPlayingBarViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NowPlayingBarViewController.swift; sourceTree = "<group>"; };
+		E403E63D246F4C3900200F58 /* NowPlayingBarViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NowPlayingBarViewController.xib; sourceTree = "<group>"; };
 		E40786182110CE6E006887B1 /* Persephone.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Persephone.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		E407861B2110CE6E006887B1 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		E407861F2110CE70006887B1 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -438,6 +444,8 @@
 		E41E5308223C020400173814 /* MPDClient+Command.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MPDClient+Command.swift"; sourceTree = "<group>"; };
 		E41E530A223C033700173814 /* MPDClient+Album.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MPDClient+Album.swift"; sourceTree = "<group>"; };
 		E41EA46B221636AF0068EF46 /* GeneralPrefsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GeneralPrefsViewController.swift; sourceTree = "<group>"; };
+		E4207C772576F7590089D21B /* NowPlayingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NowPlayingViewController.swift; sourceTree = "<group>"; };
+		E4207C782576F75A0089D21B /* NowPlayingViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NowPlayingViewController.xib; sourceTree = "<group>"; };
 		E423563F228623D2001216D6 /* QueueSongInfoView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QueueSongInfoView.swift; sourceTree = "<group>"; };
 		E42410B52241B956005ED6DF /* MPDClient+Database.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MPDClient+Database.swift"; sourceTree = "<group>"; };
 		E42A4D4E22E20D7D001C6CAD /* MPDTag.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MPDTag.swift; sourceTree = "<group>"; };
@@ -879,11 +887,11 @@
 		E442CCC42347D5B900004E0C /* Components */ = {
 			isa = PBXGroup;
 			children = (
-				E453824D23F9F700007F6BFC /* VolumeControl */,
 				E442CCCB2347D77A00004E0C /* Browser */,
 				E4A83BEC2221F5DD0098FED6 /* Preferences */,
 				E442CCC62347D5E700004E0C /* Queue */,
 				E442CCC92347D6FD00004E0C /* Shared */,
+				E453824D23F9F700007F6BFC /* VolumeControl */,
 				E442CCC52347D5CA00004E0C /* Window */,
 			);
 			path = Components;
@@ -1274,6 +1282,19 @@
 			path = Protocols;
 			sourceTree = "<group>";
 		};
+		E4D4FAE6246F4B1B00CD02AF /* Now Playing */ = {
+			isa = PBXGroup;
+			children = (
+				E403E63C246F4C3900200F58 /* NowPlayingBarViewController.swift */,
+				E403E63D246F4C3900200F58 /* NowPlayingBarViewController.xib */,
+				E4F365D024942C6A006A8C4A /* NowPlayingTabBarController.swift */,
+				E4F365D3249432C0006A8C4A /* NowPlayingTabBar.swift */,
+				E4207C772576F7590089D21B /* NowPlayingViewController.swift */,
+				E4207C782576F75A0089D21B /* NowPlayingViewController.xib */,
+			);
+			path = "Now Playing";
+			sourceTree = "<group>";
+		};
 		E4E13C2C2350D8CB00092A6E /* Layouts */ = {
 			isa = PBXGroup;
 			children = (
@@ -1546,10 +1567,14 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				E41222132431425400473C1D /* LaunchScreen.storyboard in Resources */,
+				E41222142431425400473C1D /* Main.storyboard in Resources */,
+				E4207C7A2576F75A0089D21B /* NowPlayingViewController.xib in Resources */,
 				E48059112426D73600362CF3 /* win64.txt in Resources */,
 				E480590F2426D73600362CF3 /* configure.py in Resources */,
 				E48058292426D73500362CF3 /* version.h.in in Resources */,
 				E48059152426D73600362CF3 /* build.sh in Resources */,
+				E403E63F246F4C3900200F58 /* NowPlayingBarViewController.xib in Resources */,
 				E48059132426D73600362CF3 /* win32.txt in Resources */,
 				E48059C12426D73600362CF3 /* libmpdclient.vapi in Resources */,
 			);
@@ -1815,6 +1840,7 @@
 				E48059CF2426D73600362CF3 /* cpartition.c in Sources */,
 				E4805A012426D73600362CF3 /* quote.c in Sources */,
 				E4805A092426D73600362CF3 /* fd_util.c in Sources */,
+				E4207C792576F75A0089D21B /* NowPlayingViewController.swift in Sources */,
 				E48059D52426D73600362CF3 /* resolver.c in Sources */,
 				E48059D72426D73600362CF3 /* ierror.c in Sources */,
 				E48059F32426D73600362CF3 /* capabilities.c in Sources */,
@@ -1826,6 +1852,7 @@
 				E480511F24255BDB00362CF3 /* MPDClient+Album.swift in Sources */,
 				E4805A0B2426D73600362CF3 /* sync.c in Sources */,
 				E4805A052426D73600362CF3 /* connection.c in Sources */,
+				E403E63E246F4C3900200F58 /* NowPlayingBarViewController.swift in Sources */,
 				E480512324255BDB00362CF3 /* MPDClient+Database.swift in Sources */,
 				E48059ED2426D73600362CF3 /* stats.c in Sources */,
 				E480514824255E7700362CF3 /* UIReducer.swift in Sources */,
diff --git a/Shared/State/Reducers/QueueReducer.swift b/Shared/State/Reducers/QueueReducer.swift
index 2c2fafe..9459a5f 100644
--- a/Shared/State/Reducers/QueueReducer.swift
+++ b/Shared/State/Reducers/QueueReducer.swift
@@ -28,6 +28,12 @@ func queueReducer(action: Action, state: QueueState?) -> QueueState {
       )
     }
 
+    //DispatchQueue.main.async {
+      //App.store.dispatch(
+        //UpdateCurrentSongAction(currentSong: state.queue[state.queuePos].song)
+      //)
+    //}
+
   case let action as UpdateQueuePosAction:
     let oldSongRowPos = state.queuePos
     let newSongRowPos = action.queuePos