diff --git a/Mac/Components/Browser/Album Detail/AlbumDetailView.xib b/Mac/Components/Browser/Album Detail/AlbumDetailView.xib
index c9aa311..19a2e17 100644
--- a/Mac/Components/Browser/Album Detail/AlbumDetailView.xib	
+++ b/Mac/Components/Browser/Album Detail/AlbumDetailView.xib	
@@ -79,12 +79,11 @@
                                         </textFieldCell>
                                         <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         <prototypeCellViews>
-                                            <tableCellView identifier="trackNumberCell" id="bVN-zt-KW7">
-                                                <rect key="frame" x="1" y="1" width="40" height="17"/>
-                                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                            <tableCellView identifier="trackNumberCell" translatesAutoresizingMaskIntoConstraints="NO" id="bVN-zt-KW7">
+                                                <rect key="frame" x="0.0" y="0.0" width="40" height="16"/>
                                                 <subviews>
                                                     <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="6eU-Jx-HDR">
-                                                        <rect key="frame" x="0.0" y="1" width="40" height="16"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="40" height="16"/>
                                                         <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="left" title="1." id="Z5y-oS-Qm8">
                                                             <font key="font" metaFont="system"/>
                                                             <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
@@ -93,20 +92,19 @@
                                                     </textField>
                                                 </subviews>
                                                 <constraints>
-                                                    <constraint firstItem="6eU-Jx-HDR" firstAttribute="centerY" secondItem="bVN-zt-KW7" secondAttribute="centerY" id="5cb-M0-OIZ"/>
                                                     <constraint firstItem="6eU-Jx-HDR" firstAttribute="leading" secondItem="bVN-zt-KW7" secondAttribute="leading" constant="2" id="KXb-Ua-LaU"/>
                                                     <constraint firstItem="6eU-Jx-HDR" firstAttribute="centerX" secondItem="bVN-zt-KW7" secondAttribute="centerX" id="MGU-H7-mAj"/>
+                                                    <constraint firstItem="6eU-Jx-HDR" firstAttribute="top" secondItem="bVN-zt-KW7" secondAttribute="top" id="b71-yc-bdr"/>
                                                 </constraints>
                                                 <connections>
                                                     <outlet property="textField" destination="6eU-Jx-HDR" id="DWy-vj-9Eq"/>
                                                 </connections>
                                             </tableCellView>
-                                            <tableCellView identifier="discNumberCell" id="MHh-8c-iyL">
-                                                <rect key="frame" x="1" y="20" width="40" height="17"/>
-                                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                            <tableCellView identifier="discNumberCell" translatesAutoresizingMaskIntoConstraints="NO" id="MHh-8c-iyL">
+                                                <rect key="frame" x="0.0" y="0.0" width="40" height="16"/>
                                                 <subviews>
                                                     <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="nwx-zY-r5o">
-                                                        <rect key="frame" x="0.0" y="1" width="441" height="16"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="441" height="16"/>
                                                         <constraints>
                                                             <constraint firstAttribute="width" constant="437" id="irN-AG-Pcj"/>
                                                         </constraints>
@@ -118,8 +116,9 @@
                                                     </textField>
                                                 </subviews>
                                                 <constraints>
-                                                    <constraint firstItem="nwx-zY-r5o" firstAttribute="centerY" secondItem="MHh-8c-iyL" secondAttribute="centerY" id="IOV-5t-KTN"/>
+                                                    <constraint firstItem="nwx-zY-r5o" firstAttribute="top" secondItem="MHh-8c-iyL" secondAttribute="top" id="KbM-w9-As3"/>
                                                     <constraint firstItem="nwx-zY-r5o" firstAttribute="leading" secondItem="MHh-8c-iyL" secondAttribute="leading" constant="2" id="nw0-ya-Pwt"/>
+                                                    <constraint firstAttribute="bottom" secondItem="nwx-zY-r5o" secondAttribute="bottom" id="z6c-sM-3fK"/>
                                                 </constraints>
                                                 <connections>
                                                     <outlet property="textField" destination="nwx-zY-r5o" id="NFl-7o-wmK"/>
@@ -141,7 +140,7 @@
                                         <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         <prototypeCellViews>
                                             <tableCellView identifier="songTitleCell" translatesAutoresizingMaskIntoConstraints="NO" id="41U-5i-Oot" customClass="AlbumDetailSongTitleView" customModule="Persephone" customModuleProvider="target">
-                                                <rect key="frame" x="0.0" y="0.0" width="353" height="31"/>
+                                                <rect key="frame" x="44" y="1" width="353" height="31"/>
                                                 <subviews>
                                                     <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="R8t-bV-9LI">
                                                         <rect key="frame" x="0.0" y="15" width="353" height="16"/>
@@ -154,7 +153,7 @@
                                                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="tQ2-xw-nh6">
                                                         <rect key="frame" x="0.0" y="0.0" width="353" height="15"/>
                                                         <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="left" title="Song Artist" id="1XN-kG-CWb">
-                                                            <font key="font" metaFont="system" size="12"/>
+                                                            <font key="font" metaFont="cellTitle"/>
                                                             <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
                                                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                         </textFieldCell>