diff --git a/RealmBrowser.xcodeproj/project.pbxproj b/RealmBrowser.xcodeproj/project.pbxproj
index 1a02b75..603e7b6 100644
--- a/RealmBrowser.xcodeproj/project.pbxproj
+++ b/RealmBrowser.xcodeproj/project.pbxproj
@@ -35,7 +35,6 @@
 		36B669CB1B8B057F00F04AE1 /* RLMObjectLinkSelectionViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 36B669CA1B8B057F00F04AE1 /* RLMObjectLinkSelectionViewController.xib */; };
 		36B669CE1B8B096A00F04AE1 /* RLMObjectLinkSelectionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 36B669CD1B8B096A00F04AE1 /* RLMObjectLinkSelectionViewController.m */; };
 		36C3D1FFA6C372B1485F381A /* Pods.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B4DD42CE427D384E8A7351A0 /* Pods.framework */; settings = {ATTRIBUTES = (Required, ); }; };
-		420696B41BDE95190000B74A /* RLMTableRowView.m in Sources */ = {isa = PBXBuildFile; fileRef = 420696B31BDE95190000B74A /* RLMTableRowView.m */; };
 		840F97C0192B7DCE006B591E /* RLMDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = 840F97BF192B7DCE006B591E /* RLMDocument.m */; };
 		84446534195891AA00CEEA5B /* RLMViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 84446533195891AA00CEEA5B /* RLMViewController.m */; };
 		844C34E3194859080027E902 /* TestClasses.m in Sources */ = {isa = PBXBuildFile; fileRef = 844C34E2194859080027E902 /* TestClasses.m */; };
@@ -142,8 +141,6 @@
 		36B669CA1B8B057F00F04AE1 /* RLMObjectLinkSelectionViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = RLMObjectLinkSelectionViewController.xib; sourceTree = "<group>"; };
 		36B669CC1B8B096A00F04AE1 /* RLMObjectLinkSelectionViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RLMObjectLinkSelectionViewController.h; sourceTree = "<group>"; };
 		36B669CD1B8B096A00F04AE1 /* RLMObjectLinkSelectionViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RLMObjectLinkSelectionViewController.m; sourceTree = "<group>"; };
-		420696B21BDE95190000B74A /* RLMTableRowView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RLMTableRowView.h; sourceTree = "<group>"; };
-		420696B31BDE95190000B74A /* RLMTableRowView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RLMTableRowView.m; sourceTree = "<group>"; };
 		840F97BE192B7DCE006B591E /* RLMDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RLMDocument.h; sourceTree = "<group>"; };
 		840F97BF192B7DCE006B591E /* RLMDocument.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RLMDocument.m; sourceTree = "<group>"; };
 		84446532195891AA00CEEA5B /* RLMViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RLMViewController.h; sourceTree = "<group>"; };
@@ -321,8 +318,6 @@
 				221322FC19954B0A00D25737 /* RLMTableCellView.m */,
 				225443F319E3E6360045996B /* RLMTableHeaderCell.h */,
 				225443F419E3E6360045996B /* RLMTableHeaderCell.m */,
-				420696B21BDE95190000B74A /* RLMTableRowView.h */,
-				420696B31BDE95190000B74A /* RLMTableRowView.m */,
 				8457294B1962E3860076D4F1 /* RLMTableView.h */,
 				8457294C1962E3860076D4F1 /* RLMTableView.m */,
 				225AAFEA19C09E520023B595 /* RLMTextField.h */,
@@ -719,7 +714,6 @@
 				225AAFEC19C09E520023B595 /* RLMTextField.m in Sources */,
 				84D7990C19388E8900FC76A0 /* RLMClassProperty.m in Sources */,
 				221322FD19954B0A00D25737 /* RLMTableCellView.m in Sources */,
-				420696B41BDE95190000B74A /* RLMTableRowView.m in Sources */,
 				22096B2719911F7300233D77 /* RLMBadgeTableCellView.m in Sources */,
 				228D1F871A1CAD660028562A /* RLMResultsNode.m in Sources */,
 				8457294D1962E3860076D4F1 /* RLMTableView.m in Sources */,
diff --git a/RealmBrowser/Controllers/RLMInstanceTableViewController.m b/RealmBrowser/Controllers/RLMInstanceTableViewController.m
index 659b5d5..b312e5b 100644
--- a/RealmBrowser/Controllers/RLMInstanceTableViewController.m
+++ b/RealmBrowser/Controllers/RLMInstanceTableViewController.m
@@ -28,7 +28,6 @@
 #import "RLMResultsNode.h"
 #import "RLMRealmNode.h"
 
-#import "RLMTableRowView.h"
 #import "RLMBadgeTableCellView.h"
 #import "RLMBasicTableCellView.h"
 #import "RLMBoolTableCellView.h"
@@ -294,21 +293,6 @@ - (void)tableViewSelectionDidChange:(NSNotification *)notification
     }
 }
 
-- (NSTableRowView *)tableView:(NSTableView *)tableView rowViewForRow:(NSInteger)row
-{
-    RLMTableRowView *rowView;
-    
-    rowView = [tableView makeViewWithIdentifier:@"row" owner:self];
-    
-    if (!rowView) {
-        rowView = [[RLMTableRowView alloc] initWithFrame:NSZeroRect];
-        rowView.identifier = @"row";
-        rowView.canDrawSubviewsIntoLayer = YES;
-    }
-    
-    return rowView;
-}
-
 -(NSView *)tableView:(NSTableView *)tableView viewForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)rowIndex
 {
     if (tableView != self.tableView) {
@@ -338,7 +322,7 @@ -(NSView *)tableView:(NSTableView *)tableView viewForTableColumn:(NSTableColumn
         case RLMPropertyTypeArray: {
             RLMBadgeTableCellView *badgeCellView = [tableView makeViewWithIdentifier:reuseIdentifier owner:self];
             if (!badgeCellView) {
-                badgeCellView = [RLMBadgeTableCellView makeWithIdentifier:reuseIdentifier];
+                badgeCellView = [RLMBadgeTableCellView viewWithIdentifier:reuseIdentifier];
             }
             NSString *string = [realmDescriptions printablePropertyValue:propertyValue ofType:type];
             NSDictionary *attr = @{NSUnderlineStyleAttributeName : @(NSUnderlineStyleSingle)};
@@ -358,7 +342,7 @@ -(NSView *)tableView:(NSTableView *)tableView viewForTableColumn:(NSTableColumn
         case RLMPropertyTypeBool: {
             RLMBoolTableCellView *boolCellView = [tableView makeViewWithIdentifier:reuseIdentifier owner:self];
             if (!boolCellView) {
-                boolCellView = [RLMBoolTableCellView makeWithIdentifier:reuseIdentifier];
+                boolCellView = [RLMBoolTableCellView viewWithIdentifier:reuseIdentifier];
                 boolCellView.checkBox.target = self;
                 boolCellView.checkBox.action = @selector(editedCheckBox:);
             }
@@ -375,7 +359,7 @@ -(NSView *)tableView:(NSTableView *)tableView viewForTableColumn:(NSTableColumn
         case RLMPropertyTypeDouble: {
             RLMNumberTableCellView *numberCellView = [tableView makeViewWithIdentifier:reuseIdentifier owner:self];
             if (!numberCellView) {
-                numberCellView = [RLMNumberTableCellView makeWithIdentifier:reuseIdentifier];
+                numberCellView = [RLMNumberTableCellView viewWithIdentifier:reuseIdentifier];
                 numberCellView.textField.delegate = self;
                 numberCellView.textField.target = self;
                 numberCellView.textField.action = @selector(editedTextField:);
@@ -394,7 +378,7 @@ -(NSView *)tableView:(NSTableView *)tableView viewForTableColumn:(NSTableColumn
         case RLMPropertyTypeObject: {
             RLMLinkTableCellView *linkCellView = [tableView makeViewWithIdentifier:reuseIdentifier owner:self];
             if (!linkCellView) {
-                linkCellView = [RLMLinkTableCellView makeWithIdentifier:reuseIdentifier];
+                linkCellView = [RLMLinkTableCellView viewWithIdentifier:reuseIdentifier];
                 linkCellView.textField.target = self;
                 linkCellView.textField.action = @selector(editedTextField:);
             }
@@ -415,7 +399,7 @@ -(NSView *)tableView:(NSTableView *)tableView viewForTableColumn:(NSTableColumn
         case RLMPropertyTypeString: {
             RLMBasicTableCellView *basicCellView = [tableView makeViewWithIdentifier:reuseIdentifier owner:self];
             if (!basicCellView) {
-                basicCellView = [RLMBasicTableCellView makeWithIdentifier:reuseIdentifier];
+                basicCellView = [RLMBasicTableCellView viewWithIdentifier:reuseIdentifier];
                 basicCellView.textField.delegate = self;
                 basicCellView.textField.target = self;
                 basicCellView.textField.action = @selector(editedTextField:);
diff --git a/RealmBrowser/Resources/UI/Base.lproj/RLMDocument.xib b/RealmBrowser/Resources/UI/Base.lproj/RLMDocument.xib
index 07aeceb..5f09e1f 100644
--- a/RealmBrowser/Resources/UI/Base.lproj/RLMDocument.xib
+++ b/RealmBrowser/Resources/UI/Base.lproj/RLMDocument.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9059" systemVersion="14F1021" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9059"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="RLMRealmBrowserWindowController">
@@ -22,7 +22,7 @@
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES" texturedBackground="YES" unifiedTitleAndToolbar="YES"/>
             <windowCollectionBehavior key="collectionBehavior" fullScreenPrimary="YES"/>
             <rect key="contentRect" x="247" y="192" width="977" height="476"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="877"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="900"/>
             <value key="minSize" type="size" width="440" height="200"/>
             <view key="contentView" id="gIp-Ho-8D9">
                 <rect key="frame" x="0.0" y="0.0" width="977" height="476"/>
@@ -41,10 +41,9 @@
                                             <rect key="frame" x="0.0" y="0.0" width="236" height="564"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <subviews>
-                                                <outlineView appearanceType="vibrantLight" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" selectionHighlightStyle="sourceList" multipleSelection="NO" autosaveColumns="NO" rowHeight="22" rowSizeStyle="automatic" viewBased="YES" indentationPerLevel="14" outlineTableColumn="ye8-fR-LJ8" id="IMi-6Y-gQF">
+                                                <outlineView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" selectionHighlightStyle="sourceList" multipleSelection="NO" autosaveColumns="NO" rowHeight="22" rowSizeStyle="automatic" viewBased="YES" indentationPerLevel="14" outlineTableColumn="ye8-fR-LJ8" id="IMi-6Y-gQF">
                                                     <rect key="frame" x="0.0" y="0.0" width="236" height="0.0"/>
                                                     <autoresizingMask key="autoresizingMask"/>
-                                                    <animations/>
                                                     <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"/>
@@ -65,7 +64,6 @@
                                                                 <textField identifier="HeaderLabel" verticalHuggingPriority="750" id="PZp-xm-tfc">
                                                                     <rect key="frame" x="1" y="0.0" width="233" height="17"/>
                                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                                                    <animations/>
                                                                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" usesSingleLineMode="YES" id="ntn-io-NM2">
                                                                         <font key="font" metaFont="smallSystem"/>
                                                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -78,12 +76,10 @@
                                                                     <subviews>
                                                                         <imageView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="lUk-zd-1z6">
                                                                             <rect key="frame" x="6" y="3" width="16" height="16"/>
-                                                                            <animations/>
                                                                             <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyUpOrDown" id="vIg-OG-e3y"/>
                                                                         </imageView>
                                                                         <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="EaJ-q6-IlG">
                                                                             <rect key="frame" x="10" y="2" width="287" height="18"/>
-                                                                            <animations/>
                                                                             <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="left" title="Row label" id="A0k-QZ-8eL">
                                                                                 <font key="font" metaFont="system"/>
                                                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -92,14 +88,12 @@
                                                                         </textField>
                                                                         <button hidden="YES" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="I1l-Wv-wMz">
                                                                             <rect key="frame" x="141" y="2" width="104" height="17"/>
-                                                                            <animations/>
                                                                             <buttonCell key="cell" type="roundRect" title="Instance count" bezelStyle="roundedRect" alignment="center" controlSize="small" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Lw1-PH-p6Q">
                                                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                                                 <font key="font" metaFont="smallSystem"/>
                                                                             </buttonCell>
                                                                         </button>
                                                                     </subviews>
-                                                                    <animations/>
                                                                     <connections>
                                                                         <outlet property="button" destination="I1l-Wv-wMz" id="bbO-A1-Jhu"/>
                                                                         <outlet property="imageView" destination="lUk-zd-1z6" id="FU5-UE-blk"/>
@@ -115,17 +109,13 @@
                                                     </connections>
                                                 </outlineView>
                                             </subviews>
-                                            <animations/>
                                             <nil key="backgroundColor"/>
                                         </clipView>
-                                        <animations/>
                                         <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="exH-b9-o3D">
                                             <autoresizingMask key="autoresizingMask"/>
-                                            <animations/>
                                         </scroller>
                                         <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="2YT-v9-0yd">
                                             <autoresizingMask key="autoresizingMask"/>
-                                            <animations/>
                                         </scroller>
                                     </scrollView>
                                 </subviews>
@@ -137,7 +127,6 @@
                                     <constraint firstItem="MSf-82-x0U" firstAttribute="leading" secondItem="wGq-XQ-Lyz" secondAttribute="leading" id="heW-be-7kt"/>
                                     <constraint firstItem="MSf-82-x0U" firstAttribute="top" secondItem="wGq-XQ-Lyz" secondAttribute="top" id="po8-mG-pzB"/>
                                 </constraints>
-                                <animations/>
                             </customView>
                             <customView id="XsG-4h-zWh" userLabel="MainTableView">
                                 <rect key="frame" x="237" y="0.0" width="740" height="476"/>
@@ -149,13 +138,12 @@
                                             <rect key="frame" x="0.0" y="0.0" width="740" height="476"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <subviews>
-                                                <tableView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="sequential" alternatingRowBackgroundColors="YES" autosaveName="InstanceTable" rowHeight="18" headerView="cDp-e2-1cA" viewBased="YES" id="enp-HN-e6b" customClass="RLMTableView">
-                                                    <rect key="frame" x="0.0" y="0.0" width="918" height="0.0"/>
+                                                <tableView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="none" alternatingRowBackgroundColors="YES" autosaveName="InstanceTable" rowHeight="18" headerView="cDp-e2-1cA" viewBased="YES" id="enp-HN-e6b" customClass="RLMTableView">
+                                                    <rect key="frame" x="0.0" y="0.0" width="967" height="0.0"/>
                                                     <autoresizingMask key="autoresizingMask"/>
-                                                    <animations/>
-                                                    <size key="intercellSpacing" width="3" height="2"/>
+                                                    <size key="intercellSpacing" width="10" height="2"/>
                                                     <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                                    <tableViewGridLines key="gridStyleMask" vertical="YES" horizontal="YES"/>
+                                                    <tableViewGridLines key="gridStyleMask" vertical="YES"/>
                                                     <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                                     <tableColumns>
                                                         <tableColumn editable="NO" width="121" minWidth="16" maxWidth="1000" id="9Ld-M2-qQp" userLabel="Table Column - Image">
@@ -172,17 +160,15 @@
                                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                                             <prototypeCellViews>
                                                                 <tableCellView identifier="ImageCell" id="Zr3-Z6-MDj" customClass="RLMImageTableCellView">
-                                                                    <rect key="frame" x="1" y="1" width="121" height="17"/>
+                                                                    <rect key="frame" x="5" y="1" width="121" height="17"/>
                                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                                     <subviews>
                                                                         <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Xdo-Iu-B5b">
                                                                             <rect key="frame" x="3" y="0.0" width="17" height="17"/>
-                                                                            <animations/>
                                                                             <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="NSActionTemplate" id="RI4-MK-b13"/>
                                                                         </imageView>
                                                                         <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="oFu-wx-HHi">
                                                                             <rect key="frame" x="25" y="0.0" width="92" height="17"/>
-                                                                            <animations/>
                                                                             <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="cell" id="rLS-h6-dI2">
                                                                                 <font key="font" metaFont="system"/>
                                                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -190,7 +176,6 @@
                                                                             </textFieldCell>
                                                                         </textField>
                                                                     </subviews>
-                                                                    <animations/>
                                                                     <connections>
                                                                         <outlet property="imageView" destination="Xdo-Iu-B5b" id="h97-mK-0zd"/>
                                                                         <outlet property="textField" destination="oFu-wx-HHi" id="nl5-ye-yK4"/>
@@ -212,12 +197,11 @@
                                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                                             <prototypeCellViews>
                                                                 <customView identifier="BadgeCell" id="Hd5-t2-1T1" userLabel="BadgeCellView" customClass="RLMBadgeTableCellView">
-                                                                    <rect key="frame" x="125" y="1" width="120" height="22"/>
+                                                                    <rect key="frame" x="136" y="1" width="120" height="22"/>
                                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                                     <subviews>
                                                                         <textField horizontalHuggingPriority="249" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cVi-ab-it6">
                                                                             <rect key="frame" x="1" y="3" width="88" height="17"/>
-                                                                            <animations/>
                                                                             <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="left" title="badge" id="wJ3-zo-4Dq">
                                                                                 <font key="font" metaFont="system"/>
                                                                                 <color key="textColor" name="selectedMenuItemColor" catalog="System" colorSpace="catalog"/>
@@ -226,7 +210,6 @@
                                                                         </textField>
                                                                         <button hidden="YES" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="OXI-nk-7Bf" userLabel="Badge - Instance count">
                                                                             <rect key="frame" x="97" y="2" width="20" height="17"/>
-                                                                            <animations/>
                                                                             <buttonCell key="cell" type="inline" title="i" bezelStyle="inline" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="EIT-dd-wAA">
                                                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                                                 <font key="font" metaFont="smallSystemBold"/>
@@ -240,7 +223,6 @@
                                                                         <constraint firstItem="cVi-ab-it6" firstAttribute="leading" secondItem="Hd5-t2-1T1" secondAttribute="leading" constant="3" id="foH-PE-gH2"/>
                                                                         <constraint firstItem="cVi-ab-it6" firstAttribute="centerY" secondItem="Hd5-t2-1T1" secondAttribute="centerY" id="iEb-Bu-FDU"/>
                                                                     </constraints>
-                                                                    <animations/>
                                                                     <connections>
                                                                         <outlet property="badge" destination="OXI-nk-7Bf" id="eee-fx-a7w"/>
                                                                         <outlet property="textField" destination="cVi-ab-it6" id="Pgq-bu-24o"/>
@@ -262,12 +244,11 @@
                                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                                             <prototypeCellViews>
                                                                 <customView identifier="BasicCell" horizontalHuggingPriority="750" id="j4I-rB-nX0" userLabel="BasicCellView" customClass="RLMBasicTableCellView">
-                                                                    <rect key="frame" x="248" y="1" width="100" height="22"/>
+                                                                    <rect key="frame" x="266" y="1" width="100" height="22"/>
                                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                                     <subviews>
                                                                         <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="93e-Tp-EKj" customClass="RLMTextField">
                                                                             <rect key="frame" x="1" y="3" width="98" height="17"/>
-                                                                            <animations/>
                                                                             <textFieldCell key="cell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" alignment="left" title="basic" id="qpt-2p-N69">
                                                                                 <font key="font" metaFont="system"/>
                                                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -283,7 +264,6 @@
                                                                         <constraint firstItem="93e-Tp-EKj" firstAttribute="leading" secondItem="j4I-rB-nX0" secondAttribute="leading" constant="3" id="gYm-ox-cbv"/>
                                                                         <constraint firstItem="93e-Tp-EKj" firstAttribute="centerY" secondItem="j4I-rB-nX0" secondAttribute="centerY" id="vSa-N8-zcA"/>
                                                                     </constraints>
-                                                                    <animations/>
                                                                     <connections>
                                                                         <outlet property="textField" destination="93e-Tp-EKj" id="Tnb-25-h1b"/>
                                                                     </connections>
@@ -304,12 +284,11 @@
                                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                                             <prototypeCellViews>
                                                                 <customView identifier="LinkCell" id="YQI-Ni-2Mh" userLabel="LinkCellView" customClass="RLMLinkTableCellView">
-                                                                    <rect key="frame" x="351" y="1" width="100" height="22"/>
+                                                                    <rect key="frame" x="376" y="1" width="100" height="22"/>
                                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                                     <subviews>
                                                                         <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="r8V-o9-EUV" userLabel="Text Field - link" customClass="RLMTextField">
                                                                             <rect key="frame" x="3" y="3" width="86" height="17"/>
-                                                                            <animations/>
                                                                             <textFieldCell key="cell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" alignment="left" title="link" id="HL4-Zf-clm">
                                                                                 <font key="font" metaFont="system"/>
                                                                                 <color key="textColor" red="0.21354569837895854" green="0.066052594969780221" blue="1" alpha="1" colorSpace="calibratedRGB"/>
@@ -320,7 +299,6 @@
                                                                             </textFieldCell>
                                                                         </textField>
                                                                     </subviews>
-                                                                    <animations/>
                                                                     <connections>
                                                                         <outlet property="textField" destination="r8V-o9-EUV" id="Akr-mV-uxo"/>
                                                                     </connections>
@@ -341,12 +319,11 @@
                                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                                             <prototypeCellViews>
                                                                 <customView identifier="IndexCell" id="ZNR-iz-CVh" userLabel="BasicCellView" customClass="RLMBasicTableCellView">
-                                                                    <rect key="frame" x="454" y="1" width="100" height="22"/>
+                                                                    <rect key="frame" x="486" y="1" width="100" height="22"/>
                                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                                     <subviews>
                                                                         <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="lDM-i2-eT3">
                                                                             <rect key="frame" x="1" y="4" width="98" height="14"/>
-                                                                            <animations/>
                                                                             <textFieldCell key="cell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" alignment="right" title="index" usesSingleLineMode="YES" id="Iwz-HM-iW2">
                                                                                 <font key="font" metaFont="smallSystem"/>
                                                                                 <color key="textColor" name="disabledControlTextColor" catalog="System" colorSpace="catalog"/>
@@ -359,7 +336,6 @@
                                                                         <constraint firstItem="lDM-i2-eT3" firstAttribute="leading" secondItem="ZNR-iz-CVh" secondAttribute="leading" constant="3" id="gCe-iP-7Pt"/>
                                                                         <constraint firstItem="lDM-i2-eT3" firstAttribute="centerY" secondItem="ZNR-iz-CVh" secondAttribute="centerY" id="hrL-BM-3eu"/>
                                                                     </constraints>
-                                                                    <animations/>
                                                                     <connections>
                                                                         <outlet property="textField" destination="lDM-i2-eT3" id="hhS-Bf-N7P"/>
                                                                     </connections>
@@ -380,12 +356,11 @@
                                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                                             <prototypeCellViews>
                                                                 <customView identifier="NumberCell" id="Gj6-W6-FXj" userLabel="NumberCellView" customClass="RLMNumberTableCellView">
-                                                                    <rect key="frame" x="557" y="1" width="100" height="22"/>
+                                                                    <rect key="frame" x="596" y="1" width="100" height="22"/>
                                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                                     <subviews>
                                                                         <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="OBR-LJ-wHt" customClass="RLMNumberTextField">
                                                                             <rect key="frame" x="1" y="3" width="98" height="17"/>
-                                                                            <animations/>
                                                                             <textFieldCell key="cell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" alignment="right" title="number" usesSingleLineMode="YES" id="yDh-qQ-3JX">
                                                                                 <font key="font" metaFont="system"/>
                                                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -404,7 +379,6 @@
                                                                         <constraint firstItem="OBR-LJ-wHt" firstAttribute="centerY" secondItem="Gj6-W6-FXj" secondAttribute="centerY" id="hZZ-Ad-1Hx"/>
                                                                         <constraint firstItem="OBR-LJ-wHt" firstAttribute="leading" secondItem="Gj6-W6-FXj" secondAttribute="leading" constant="3" id="vly-l7-PKg"/>
                                                                     </constraints>
-                                                                    <animations/>
                                                                     <connections>
                                                                         <outlet property="textField" destination="OBR-LJ-wHt" id="lXR-p5-Ve9"/>
                                                                     </connections>
@@ -425,12 +399,11 @@
                                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                                             <prototypeCellViews>
                                                                 <customView identifier="BoolCell" id="sLz-cM-Sl8" userLabel="BoolCellView" customClass="RLMBoolTableCellView">
-                                                                    <rect key="frame" x="660" y="1" width="86" height="22"/>
+                                                                    <rect key="frame" x="706" y="1" width="256" height="22"/>
                                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                                     <subviews>
                                                                         <button misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="CbB-PG-BtE">
                                                                             <rect key="frame" x="32" y="2" width="22" height="18"/>
-                                                                            <animations/>
                                                                             <buttonCell key="cell" type="check" bezelStyle="regularSquare" imagePosition="left" alignment="center" state="on" inset="2" id="WbG-3D-fJz">
                                                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                                                 <font key="font" metaFont="system"/>
@@ -444,7 +417,6 @@
                                                                         <constraint firstItem="CbB-PG-BtE" firstAttribute="centerX" secondItem="sLz-cM-Sl8" secondAttribute="centerX" id="9LF-nP-KbT"/>
                                                                         <constraint firstItem="CbB-PG-BtE" firstAttribute="centerY" secondItem="sLz-cM-Sl8" secondAttribute="centerY" id="y4o-ES-IsK"/>
                                                                     </constraints>
-                                                                    <animations/>
                                                                     <connections>
                                                                         <outlet property="checkBox" destination="CbB-PG-BtE" id="XE1-35-AhP"/>
                                                                     </connections>
@@ -458,23 +430,18 @@
                                                     </connections>
                                                 </tableView>
                                             </subviews>
-                                            <animations/>
                                             <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                         </clipView>
-                                        <animations/>
                                         <scroller key="horizontalScroller" verticalHuggingPriority="750" horizontal="YES" id="4Ib-5w-NOS">
                                             <rect key="frame" x="0.0" y="548" width="740" height="16"/>
                                             <autoresizingMask key="autoresizingMask"/>
-                                            <animations/>
                                         </scroller>
                                         <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="PKq-wN-eoD">
                                             <autoresizingMask key="autoresizingMask"/>
-                                            <animations/>
                                         </scroller>
                                         <tableHeaderView key="headerView" id="cDp-e2-1cA">
-                                            <rect key="frame" x="0.0" y="0.0" width="918" height="23"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="967" height="23"/>
                                             <autoresizingMask key="autoresizingMask"/>
-                                            <animations/>
                                         </tableHeaderView>
                                     </scrollView>
                                 </subviews>
@@ -484,10 +451,8 @@
                                     <constraint firstAttribute="bottom" secondItem="3b6-BA-X5L" secondAttribute="bottom" id="VzH-qT-268"/>
                                     <constraint firstItem="3b6-BA-X5L" firstAttribute="leading" secondItem="XsG-4h-zWh" secondAttribute="leading" id="tHS-lc-oSF"/>
                                 </constraints>
-                                <animations/>
                             </customView>
                         </subviews>
-                        <animations/>
                         <holdingPriorities>
                             <real value="346"/>
                             <real value="250"/>
@@ -500,7 +465,6 @@
                     <constraint firstItem="IXc-8a-g01" firstAttribute="top" secondItem="gIp-Ho-8D9" secondAttribute="top" id="jUk-Ng-34q"/>
                     <constraint firstAttribute="trailing" secondItem="IXc-8a-g01" secondAttribute="trailing" id="sFX-QX-Q7C"/>
                 </constraints>
-                <animations/>
             </view>
             <toolbar key="toolbar" implicitIdentifier="C65F63A5-F554-46B8-9926-9CAAAC19813C" autosavesConfiguration="NO" displayMode="iconOnly" sizeMode="small" id="rfo-lS-fnD">
                 <allowedToolbarItems>
@@ -511,7 +475,6 @@
                         <segmentedControl key="view" verticalHuggingPriority="750" id="2Ep-Z1-kHF">
                             <rect key="frame" x="0.0" y="14" width="67" height="28"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                            <animations/>
                             <segmentedCell key="cell" borderStyle="border" alignment="left" style="texturedSquare" trackingMode="momentary" id="8pQ-he-SG1">
                                 <font key="font" metaFont="system"/>
                                 <segments>
@@ -531,7 +494,6 @@
                         <searchField key="view" wantsLayer="YES" verticalHuggingPriority="750" id="d5n-tM-xUt">
                             <rect key="frame" x="0.0" y="14" width="96" height="22"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                            <animations/>
                             <searchFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" borderStyle="bezel" usesSingleLineMode="YES" bezelStyle="round" id="xW4-0M-Izf">
                                 <font key="font" metaFont="system"/>
                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
diff --git a/RealmBrowser/Views/RLMBadgeTableCellView.h b/RealmBrowser/Views/RLMBadgeTableCellView.h
index e408d85..701b9d7 100644
--- a/RealmBrowser/Views/RLMBadgeTableCellView.h
+++ b/RealmBrowser/Views/RLMBadgeTableCellView.h
@@ -21,8 +21,6 @@
 
 @interface RLMBadgeTableCellView : RLMLinkTableCellView
 
-@property (strong) IBOutlet NSButton *badge;
-
-+ (instancetype)makeWithIdentifier:(NSString *)identifier;
+@property (assign) IBOutlet NSButton *badge;
 
 @end
diff --git a/RealmBrowser/Views/RLMBadgeTableCellView.m b/RealmBrowser/Views/RLMBadgeTableCellView.m
index 5d4264f..dfd68d5 100644
--- a/RealmBrowser/Views/RLMBadgeTableCellView.m
+++ b/RealmBrowser/Views/RLMBadgeTableCellView.m
@@ -20,77 +20,82 @@
 
 @implementation RLMBadgeTableCellView
 
-+ (instancetype)makeWithIdentifier:(NSString *)identifier
+- (instancetype)initWithFrame:(NSRect)frameRect
 {
-    RLMBadgeTableCellView *cellView = [[RLMBadgeTableCellView alloc] initWithFrame:NSZeroRect];
-    cellView.identifier = identifier;
-    NSTextField *textField = [[NSTextField alloc] initWithFrame:[cellView frame]];
-    [textField setBordered:NO];
-    [textField setDrawsBackground:NO];
-    [textField setTextColor:[NSColor selectedMenuItemTextColor]];
-    cellView.textField = textField;
-    [cellView addSubview:textField];
+    self = [super initWithFrame:frameRect];
+    
+    if (self == nil) {
+        return nil;
+    }
+
     NSButton *button = [[NSButton alloc] initWithFrame:NSZeroRect];
-    [button setButtonType:NSMomentaryPushInButton];
-    [button setBezelStyle:NSInlineBezelStyle];
-    cellView.badge = button;
-    [cellView addSubview:button];
+    button.translatesAutoresizingMaskIntoConstraints = NO;
+    button.buttonType = NSMomentaryPushInButton;
+    button.bezelStyle = NSInlineBezelStyle;
+    
+    self.badge = button;
+    [self addSubview:button];
     
-    [textField setTranslatesAutoresizingMaskIntoConstraints:NO];
-    [button setTranslatesAutoresizingMaskIntoConstraints:NO];
+    // Remove all constraints from RLMLinkTableCellView
+    [self removeConstraints:self.constraints];
 
-    [cellView addConstraint:[NSLayoutConstraint constraintWithItem:textField
-                                                         attribute:NSLayoutAttributeLeading
-                                                         relatedBy:NSLayoutRelationEqual
-                                                            toItem:cellView
-                                                         attribute:NSLayoutAttributeLeading
-                                                        multiplier:1.0
-                                                          constant:0.0]];
-    NSLayoutConstraint *constraint = [NSLayoutConstraint constraintWithItem:textField
-                                                                 attribute:NSLayoutAttributeTrailing
-                                                                 relatedBy:NSLayoutRelationEqual
-                                                                    toItem:button
-                                                                 attribute:NSLayoutAttributeLeading
-                                                                multiplier:1.0
-                                                                  constant:20.0];
-    [constraint setPriority:NSLayoutPriorityRequired];
-    [cellView addConstraint:constraint];
-    [cellView addConstraint:[NSLayoutConstraint constraintWithItem:button
-                                                         attribute:NSLayoutAttributeTrailing
-                                                         relatedBy:NSLayoutRelationEqual
-                                                            toItem:cellView
-                                                         attribute:NSLayoutAttributeTrailing
-                                                        multiplier:1.0
-                                                          constant:-3.0]];
+    [self addConstraint:[NSLayoutConstraint constraintWithItem:self.textField
+                                                     attribute:NSLayoutAttributeLeading
+                                                     relatedBy:NSLayoutRelationEqual
+                                                        toItem:self
+                                                     attribute:NSLayoutAttributeLeading
+                                                    multiplier:1.0
+                                                      constant:0.0]];
+    
+    [self addConstraint:[NSLayoutConstraint constraintWithItem:self.textField
+                                                     attribute:NSLayoutAttributeTop
+                                                     relatedBy:NSLayoutRelationEqual
+                                                        toItem:self
+                                                     attribute:NSLayoutAttributeTop
+                                                    multiplier:1.0
+                                                      constant:0.0]];
+    
+    [self addConstraint:[NSLayoutConstraint constraintWithItem:self.textField
+                                                     attribute:NSLayoutAttributeBottom
+                                                     relatedBy:NSLayoutRelationEqual
+                                                        toItem:self
+                                                     attribute:NSLayoutAttributeBottom
+                                                    multiplier:1.0
+                                                      constant:0.0]];
     
+    [self addConstraint:[NSLayoutConstraint constraintWithItem:self.textField
+                                                     attribute:NSLayoutAttributeTrailing
+                                                     relatedBy:NSLayoutRelationLessThanOrEqual
+                                                        toItem:self.badge
+                                                     attribute:NSLayoutAttributeLeading
+                                                    multiplier:1.0
+                                                      constant:-3.0]];
     
-    constraint = [NSLayoutConstraint constraintWithItem:button
-                                                                  attribute:NSLayoutAttributeWidth
-                                                                  relatedBy:NSLayoutRelationEqual
-                                                                     toItem:nil
-                                                                  attribute:0
-                                                                 multiplier:1.0
-                                                                   constant:20.0];
-    [constraint setPriority:NSLayoutPriorityRequired];
-    [cellView addConstraint:constraint];
+    [self addConstraint:[NSLayoutConstraint constraintWithItem:self.badge
+                                                     attribute:NSLayoutAttributeTrailing
+                                                     relatedBy:NSLayoutRelationEqual
+                                                        toItem:self
+                                                     attribute:NSLayoutAttributeTrailing
+                                                    multiplier:1.0
+                                                      constant:-3.0]];
     
+    [self addConstraint:[NSLayoutConstraint constraintWithItem:self.badge
+                                                     attribute:NSLayoutAttributeWidth
+                                                     relatedBy:NSLayoutRelationEqual
+                                                        toItem:nil
+                                                     attribute:0
+                                                    multiplier:1.0
+                                                      constant:20.0]];
     
-    [cellView addConstraint:[NSLayoutConstraint constraintWithItem:button
-                                                         attribute:NSLayoutAttributeCenterY
-                                                         relatedBy:NSLayoutRelationEqual
-                                                            toItem:cellView
-                                                         attribute:NSLayoutAttributeCenterY
-                                                        multiplier:1.0
-                                                          constant:0.0]];
-    [cellView addConstraint:[NSLayoutConstraint constraintWithItem:textField
-                                                         attribute:NSLayoutAttributeCenterY
-                                                         relatedBy:NSLayoutRelationEqual
-                                                            toItem:cellView
-                                                         attribute:NSLayoutAttributeCenterY
-                                                        multiplier:1.0
-                                                          constant:0.0]];
+    [self addConstraint:[NSLayoutConstraint constraintWithItem:self.badge
+                                                     attribute:NSLayoutAttributeCenterY
+                                                     relatedBy:NSLayoutRelationEqual
+                                                        toItem:self
+                                                     attribute:NSLayoutAttributeCenterY
+                                                    multiplier:1.0
+                                                      constant:0.0]];
     
-    return cellView;
+    return self;
 }
 
 @end
diff --git a/RealmBrowser/Views/RLMBasicTableCellView.h b/RealmBrowser/Views/RLMBasicTableCellView.h
index 8ebd617..9c84c2c 100644
--- a/RealmBrowser/Views/RLMBasicTableCellView.h
+++ b/RealmBrowser/Views/RLMBasicTableCellView.h
@@ -20,6 +20,4 @@
 
 @interface RLMBasicTableCellView : RLMTableCellView
 
-+ (instancetype)makeWithIdentifier:(NSString *)identifier;
-
 @end
diff --git a/RealmBrowser/Views/RLMBasicTableCellView.m b/RealmBrowser/Views/RLMBasicTableCellView.m
index 5a3b82d..ac1ae40 100644
--- a/RealmBrowser/Views/RLMBasicTableCellView.m
+++ b/RealmBrowser/Views/RLMBasicTableCellView.m
@@ -20,49 +20,57 @@
 
 @implementation RLMBasicTableCellView
 
-+ (instancetype)makeWithIdentifier:(NSString *)identifier
+- (instancetype)initWithFrame:(NSRect)frameRect
 {
-    RLMBasicTableCellView *cellView = [[RLMBasicTableCellView alloc] initWithFrame:NSZeroRect];
-    cellView.identifier = identifier;
-    NSTextField *textField = [[NSTextField alloc] initWithFrame:[cellView frame]];
-    [textField setBordered:NO];
-    [textField setDrawsBackground:NO];
-    cellView.textField = textField;
-    [cellView addSubview:textField];
+    self = [super initWithFrame:frameRect];
     
-    [textField setTranslatesAutoresizingMaskIntoConstraints:NO];
+    if (self == nil) {
+        return nil;
+    }
     
-    [cellView addConstraint:[NSLayoutConstraint constraintWithItem:textField
-                                                         attribute:NSLayoutAttributeLeading
-                                                         relatedBy:NSLayoutRelationEqual
-                                                            toItem:cellView
-                                                         attribute:NSLayoutAttributeLeading
-                                                        multiplier:1.0
-                                                          constant:0.0]];
-    [cellView addConstraint:[NSLayoutConstraint constraintWithItem:textField
-                                                         attribute:NSLayoutAttributeTrailing
-                                                         relatedBy:NSLayoutRelationEqual
-                                                            toItem:cellView
-                                                         attribute:NSLayoutAttributeTrailing
-                                                        multiplier:1.0
-                                                          constant:0.0]];
+    NSTextField *textField = [[NSTextField alloc] initWithFrame:self.bounds];
+    textField.translatesAutoresizingMaskIntoConstraints = NO;
+    textField.bordered = NO;
+    textField.drawsBackground = NO;
+    textField.usesSingleLineMode = YES;
+    textField.lineBreakMode = NSLineBreakByTruncatingTail;
     
-    [cellView addConstraint:[NSLayoutConstraint constraintWithItem:textField
-                                                         attribute:NSLayoutAttributeTop
-                                                         relatedBy:NSLayoutRelationEqual
-                                                            toItem:cellView
-                                                         attribute:NSLayoutAttributeTop
-                                                        multiplier:1.0
-                                                          constant:0.0]];
-    [cellView addConstraint:[NSLayoutConstraint constraintWithItem:textField
-                                                         attribute:NSLayoutAttributeBottom
-                                                         relatedBy:NSLayoutRelationEqual
-                                                            toItem:cellView
-                                                         attribute:NSLayoutAttributeBottom
-                                                        multiplier:1.0
-                                                          constant:0.0]];
+    self.textField = textField;
+    [self addSubview:textField];
     
-    return cellView;
+    [self addConstraint:[NSLayoutConstraint constraintWithItem:self.textField
+                                                     attribute:NSLayoutAttributeLeading
+                                                     relatedBy:NSLayoutRelationEqual
+                                                        toItem:self
+                                                     attribute:NSLayoutAttributeLeading
+                                                    multiplier:1.0
+                                                      constant:0.0]];
+    
+    [self addConstraint:[NSLayoutConstraint constraintWithItem:self.textField
+                                                     attribute:NSLayoutAttributeTrailing
+                                                     relatedBy:NSLayoutRelationEqual
+                                                        toItem:self
+                                                     attribute:NSLayoutAttributeTrailing
+                                                    multiplier:1.0
+                                                      constant:0.0]];
+    
+    [self addConstraint:[NSLayoutConstraint constraintWithItem:self.textField
+                                                     attribute:NSLayoutAttributeTop
+                                                     relatedBy:NSLayoutRelationEqual
+                                                        toItem:self
+                                                     attribute:NSLayoutAttributeTop
+                                                    multiplier:1.0
+                                                      constant:0.0]];
+    
+    [self addConstraint:[NSLayoutConstraint constraintWithItem:self.textField
+                                                     attribute:NSLayoutAttributeBottom
+                                                     relatedBy:NSLayoutRelationEqual
+                                                        toItem:self
+                                                     attribute:NSLayoutAttributeBottom
+                                                    multiplier:1.0
+                                                      constant:0.0]];
+    
+    return self;
 }
 
 @end
diff --git a/RealmBrowser/Views/RLMBoolTableCellView.h b/RealmBrowser/Views/RLMBoolTableCellView.h
index 847bd69..cb22843 100644
--- a/RealmBrowser/Views/RLMBoolTableCellView.h
+++ b/RealmBrowser/Views/RLMBoolTableCellView.h
@@ -20,8 +20,6 @@
 
 @interface RLMBoolTableCellView : RLMTableCellView
 
-@property(strong) IBOutlet NSButton *checkBox;
-
-+ (instancetype)makeWithIdentifier:(NSString *)identifier;
+@property (assign) IBOutlet NSButton *checkBox;
 
 @end
diff --git a/RealmBrowser/Views/RLMBoolTableCellView.m b/RealmBrowser/Views/RLMBoolTableCellView.m
index fbbf49e..dfddbf4 100644
--- a/RealmBrowser/Views/RLMBoolTableCellView.m
+++ b/RealmBrowser/Views/RLMBoolTableCellView.m
@@ -20,34 +20,39 @@
 
 @implementation RLMBoolTableCellView
 
-+ (instancetype)makeWithIdentifier:(NSString *)identifier {
-    RLMBoolTableCellView *cellView = [[RLMBoolTableCellView alloc] initWithFrame:NSZeroRect];
-    cellView.identifier = identifier;
-    NSButton *button = [[NSButton alloc] initWithFrame:[cellView frame]];
-    [button setTitle:@""];
-    [button setButtonType:NSSwitchButton];
-    [button setBezelStyle:0];
-    cellView.checkBox = button;
-    [cellView addSubview:button];
+- (instancetype)initWithFrame:(NSRect)frameRect
+{
+    self = [super initWithFrame:frameRect];
     
-    [button setTranslatesAutoresizingMaskIntoConstraints:NO];
+    if (self == nil) {
+        return nil;
+    }
     
-    [cellView addConstraint:[NSLayoutConstraint constraintWithItem:button
-                                                         attribute:NSLayoutAttributeCenterX
-                                                         relatedBy:NSLayoutRelationEqual
-                                                            toItem:cellView
-                                                         attribute:NSLayoutAttributeCenterX
-                                                        multiplier:1.0
-                                                          constant:0.0]];
-    [cellView addConstraint:[NSLayoutConstraint constraintWithItem:button
-                                                         attribute:NSLayoutAttributeCenterY
-                                                         relatedBy:NSLayoutRelationEqual
-                                                            toItem:cellView
-                                                         attribute:NSLayoutAttributeCenterY
-                                                        multiplier:1.0
-                                                          constant:0.0]];
+    NSButton *button = [[NSButton alloc] initWithFrame:self.bounds];
+    button.translatesAutoresizingMaskIntoConstraints = NO;
+    button.title = @"";
+    button.buttonType = NSSwitchButton;
+    
+    self.checkBox = button;
+    [self addSubview:button];
+    
+    [self addConstraint:[NSLayoutConstraint constraintWithItem:self.checkBox
+                                                     attribute:NSLayoutAttributeCenterX
+                                                     relatedBy:NSLayoutRelationEqual
+                                                        toItem:self
+                                                     attribute:NSLayoutAttributeCenterX
+                                                    multiplier:1.0
+                                                      constant:0.0]];
+    
+    [self addConstraint:[NSLayoutConstraint constraintWithItem:self.checkBox
+                                                     attribute:NSLayoutAttributeCenterY
+                                                     relatedBy:NSLayoutRelationEqual
+                                                        toItem:self
+                                                     attribute:NSLayoutAttributeCenterY
+                                                    multiplier:1.0
+                                                      constant:0.0]];
 
-    return cellView;
+    return self;
 }
 
 @end
diff --git a/RealmBrowser/Views/RLMLinkTableCellView.h b/RealmBrowser/Views/RLMLinkTableCellView.h
index e35532d..e2d753a 100644
--- a/RealmBrowser/Views/RLMLinkTableCellView.h
+++ b/RealmBrowser/Views/RLMLinkTableCellView.h
@@ -16,10 +16,8 @@
 //
 ////////////////////////////////////////////////////////////////////////////
 
-#import "RLMTableCellView.h"
+#import "RLMBasicTableCellView.h"
 
-@interface RLMLinkTableCellView : RLMTableCellView
-
-+ (instancetype)makeWithIdentifier:(NSString *)identifier;
+@interface RLMLinkTableCellView : RLMBasicTableCellView
 
 @end
diff --git a/RealmBrowser/Views/RLMLinkTableCellView.m b/RealmBrowser/Views/RLMLinkTableCellView.m
index 6cc5791..f072447 100644
--- a/RealmBrowser/Views/RLMLinkTableCellView.m
+++ b/RealmBrowser/Views/RLMLinkTableCellView.m
@@ -21,52 +21,6 @@
 
 @implementation RLMLinkTableCellView
 
-+ (instancetype)makeWithIdentifier:(NSString *)identifier
-{
-    RLMLinkTableCellView *cellView = [[RLMLinkTableCellView alloc] initWithFrame:NSZeroRect];
-    cellView.identifier = identifier;
-    NSTextField *textField = [[NSTextField alloc] initWithFrame:[cellView frame]];
-    [textField setBordered:NO];
-    [textField setDrawsBackground:NO];
-    [textField setTextColor:[NSColor selectedMenuItemTextColor]];
-    cellView.textField = textField;
-    [cellView addSubview:textField];
-    
-    [textField setTranslatesAutoresizingMaskIntoConstraints:NO];
-    
-    [cellView addConstraint:[NSLayoutConstraint constraintWithItem:textField
-                                                         attribute:NSLayoutAttributeLeading
-                                                         relatedBy:NSLayoutRelationEqual
-                                                            toItem:cellView
-                                                         attribute:NSLayoutAttributeLeading
-                                                        multiplier:1.0
-                                                          constant:0.0]];
-    [cellView addConstraint:[NSLayoutConstraint constraintWithItem:textField
-                                                         attribute:NSLayoutAttributeTrailing
-                                                         relatedBy:NSLayoutRelationEqual
-                                                            toItem:cellView
-                                                         attribute:NSLayoutAttributeTrailing
-                                                        multiplier:1.0
-                                                          constant:0.0]];
-    
-    [cellView addConstraint:[NSLayoutConstraint constraintWithItem:textField
-                                                         attribute:NSLayoutAttributeTop
-                                                         relatedBy:NSLayoutRelationEqual
-                                                            toItem:cellView
-                                                         attribute:NSLayoutAttributeTop
-                                                        multiplier:1.0
-                                                          constant:0.0]];
-    [cellView addConstraint:[NSLayoutConstraint constraintWithItem:textField
-                                                         attribute:NSLayoutAttributeBottom
-                                                         relatedBy:NSLayoutRelationEqual
-                                                            toItem:cellView
-                                                         attribute:NSLayoutAttributeBottom
-                                                        multiplier:1.0
-                                                          constant:0.0]];
-    
-    return cellView;
-}
-
 - (void)setBackgroundStyle:(NSBackgroundStyle)backgroundStyle {
     [super setBackgroundStyle:backgroundStyle];
     self.textField.textColor = (backgroundStyle == NSBackgroundStyleLight ? [NSColor linkColor] : [NSColor whiteColor]);
diff --git a/RealmBrowser/Views/RLMNumberTableCellView.h b/RealmBrowser/Views/RLMNumberTableCellView.h
index e65a995..dad22e8 100644
--- a/RealmBrowser/Views/RLMNumberTableCellView.h
+++ b/RealmBrowser/Views/RLMNumberTableCellView.h
@@ -29,6 +29,4 @@
 
 @interface RLMNumberTableCellView : RLMTableCellView
 
-+ (instancetype)makeWithIdentifier:(NSString *)identifier;
-
 @end
diff --git a/RealmBrowser/Views/RLMNumberTableCellView.m b/RealmBrowser/Views/RLMNumberTableCellView.m
index ea4f5c8..8eb232f 100644
--- a/RealmBrowser/Views/RLMNumberTableCellView.m
+++ b/RealmBrowser/Views/RLMNumberTableCellView.m
@@ -68,49 +68,58 @@ -(BOOL)becomeFirstResponder {
 
 @implementation RLMNumberTableCellView
 
-+ (instancetype)makeWithIdentifier:(NSString *)identifier {
-    RLMNumberTableCellView *cellView = [[RLMNumberTableCellView alloc] initWithFrame:NSZeroRect];
-    cellView.identifier = identifier;
-    RLMNumberTextField *textField = [[RLMNumberTextField alloc] initWithFrame:[cellView frame]];
-    [textField setBordered:NO];
-    [textField setDrawsBackground:NO];
-    [textField setAlignment:NSRightTextAlignment];
-    cellView.textField = textField;
-    [cellView addSubview:textField];
+- (instancetype)initWithFrame:(NSRect)frameRect
+{
+    self = [super initWithFrame:frameRect];
     
-    [textField setTranslatesAutoresizingMaskIntoConstraints:NO];
+    if (self == nil) {
+        return nil;
+    }
+    
+    RLMNumberTextField *textField = [[RLMNumberTextField alloc] initWithFrame:self.bounds];
+    textField.translatesAutoresizingMaskIntoConstraints = NO;
+    textField.bordered = NO;
+    textField.drawsBackground = NO;
+    textField.alignment = NSRightTextAlignment;
+    textField.usesSingleLineMode = YES;
+    textField.lineBreakMode = NSLineBreakByTruncatingTail;
+    
+    self.textField = textField;
+    [self addSubview:textField];
     
-    [cellView addConstraint:[NSLayoutConstraint constraintWithItem:textField
-                                                         attribute:NSLayoutAttributeLeading
-                                                         relatedBy:NSLayoutRelationEqual
-                                                            toItem:cellView
-                                                         attribute:NSLayoutAttributeLeading
-                                                        multiplier:1.0
-                                                          constant:0.0]];
-    [cellView addConstraint:[NSLayoutConstraint constraintWithItem:textField
-                                                         attribute:NSLayoutAttributeTrailing
-                                                         relatedBy:NSLayoutRelationEqual
-                                                            toItem:cellView
-                                                         attribute:NSLayoutAttributeTrailing
-                                                        multiplier:1.0
-                                                          constant:0.0]];
-
-    [cellView addConstraint:[NSLayoutConstraint constraintWithItem:textField
-                                                         attribute:NSLayoutAttributeTop
-                                                         relatedBy:NSLayoutRelationEqual
-                                                            toItem:cellView
-                                                         attribute:NSLayoutAttributeTop
-                                                        multiplier:1.0
-                                                          constant:0.0]];
-    [cellView addConstraint:[NSLayoutConstraint constraintWithItem:textField
-                                                         attribute:NSLayoutAttributeBottom
-                                                         relatedBy:NSLayoutRelationEqual
-                                                            toItem:cellView
-                                                         attribute:NSLayoutAttributeBottom
-                                                        multiplier:1.0
-                                                          constant:0.0]];
+    [self addConstraint:[NSLayoutConstraint constraintWithItem:self.textField
+                                                     attribute:NSLayoutAttributeLeading
+                                                     relatedBy:NSLayoutRelationEqual
+                                                        toItem:self
+                                                     attribute:NSLayoutAttributeLeading
+                                                    multiplier:1.0
+                                                      constant:0.0]];
     
-    return cellView;
+    [self addConstraint:[NSLayoutConstraint constraintWithItem:self.textField
+                                                     attribute:NSLayoutAttributeTrailing
+                                                     relatedBy:NSLayoutRelationEqual
+                                                        toItem:self
+                                                     attribute:NSLayoutAttributeTrailing
+                                                    multiplier:1.0
+                                                      constant:0.0]];
+
+    [self addConstraint:[NSLayoutConstraint constraintWithItem:self.textField
+                                                     attribute:NSLayoutAttributeTop
+                                                     relatedBy:NSLayoutRelationEqual
+                                                        toItem:self
+                                                     attribute:NSLayoutAttributeTop
+                                                    multiplier:1.0
+                                                      constant:0.0]];
+    
+    [self addConstraint:[NSLayoutConstraint constraintWithItem:self.textField
+                                                     attribute:NSLayoutAttributeBottom
+                                                     relatedBy:NSLayoutRelationEqual
+                                                        toItem:self
+                                                     attribute:NSLayoutAttributeBottom
+                                                    multiplier:1.0
+                                                      constant:0.0]];
+    
+    return self;
 }
 
 @end
diff --git a/RealmBrowser/Views/RLMTableCellView.h b/RealmBrowser/Views/RLMTableCellView.h
index b8218e4..76dadb2 100644
--- a/RealmBrowser/Views/RLMTableCellView.h
+++ b/RealmBrowser/Views/RLMTableCellView.h
@@ -21,6 +21,8 @@
 @class RLMTextField;
 @interface RLMTableCellView : NSTableCellView
 
++ (instancetype)viewWithIdentifier:(NSString *)identifier;
+
 @property (nonatomic, readonly) RLMTextField *realmTextField;
 
 @end
diff --git a/RealmBrowser/Views/RLMTableCellView.m b/RealmBrowser/Views/RLMTableCellView.m
index 20aeca4..0bbda0d 100644
--- a/RealmBrowser/Views/RLMTableCellView.m
+++ b/RealmBrowser/Views/RLMTableCellView.m
@@ -20,10 +20,29 @@
 
 @implementation RLMTableCellView
 
++ (instancetype)viewWithIdentifier:(NSString *)identifier
+{
+    RLMTableCellView *view = [[self alloc] initWithFrame:NSZeroRect];
+    view.identifier = identifier;
+    
+    return view;
+}
+
 - (instancetype)initWithFrame:(NSRect)frameRect
 {
     if (self = [super initWithFrame:frameRect]) {
         self.canDrawSubviewsIntoLayer = YES;
+        self.layerContentsRedrawPolicy = NSViewLayerContentsRedrawDuringViewResize;
+    }
+    
+    return self;
+}
+
+- (instancetype)initWithCoder:(NSCoder *)coder
+{
+    if (self = [super initWithCoder:coder]) {
+        self.canDrawSubviewsIntoLayer = YES;
+        self.layerContentsRedrawPolicy = NSViewLayerContentsRedrawDuringViewResize;
     }
     
     return self;
diff --git a/RealmBrowser/Views/RLMTableHeaderCell.m b/RealmBrowser/Views/RLMTableHeaderCell.m
index a883008..5478a9a 100644
--- a/RealmBrowser/Views/RLMTableHeaderCell.m
+++ b/RealmBrowser/Views/RLMTableHeaderCell.m
@@ -25,12 +25,10 @@ - (void)drawWithFrame:(CGRect)cellFrame inView:(NSView *)view
     CGRect fillRect, borderRect;
     CGRectDivide(cellFrame, &borderRect, &fillRect, 1.0, CGRectMaxYEdge);
     
-    NSGradient *gradient = [[NSGradient alloc]
-                            initWithStartingColor:[NSColor whiteColor]
-                            endingColor:[NSColor whiteColor]];
-    [gradient drawInRect:fillRect angle:90.0];
+    [[NSColor whiteColor] set];
+    NSRectFill(fillRect);
     
-    [[NSColor colorWithDeviceWhite:0.0 alpha:1.0] set];
+    [[NSColor grayColor] set];
     NSRectFill(borderRect);
     
     [self drawInteriorWithFrame:cellFrame inView:view];
diff --git a/RealmBrowser/Views/RLMTableRowView.h b/RealmBrowser/Views/RLMTableRowView.h
deleted file mode 100644
index c775b8e..0000000
--- a/RealmBrowser/Views/RLMTableRowView.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-//  RLMTableRowView.h
-//  RealmBrowser
-//
-//  Created by Matt Bauer on 10/26/15.
-//  Copyright © 2015 Realm inc. All rights reserved.
-//
-
-#import <Cocoa/Cocoa.h>
-
-@interface RLMTableRowView : NSTableRowView
-
-@end
diff --git a/RealmBrowser/Views/RLMTableRowView.m b/RealmBrowser/Views/RLMTableRowView.m
deleted file mode 100644
index 828e166..0000000
--- a/RealmBrowser/Views/RLMTableRowView.m
+++ /dev/null
@@ -1,18 +0,0 @@
-//
-//  RLMTableRowView.m
-//  RealmBrowser
-//
-//  Created by Matt Bauer on 10/26/15.
-//  Copyright © 2015 Realm inc. All rights reserved.
-//
-
-#import "RLMTableRowView.h"
-
-@implementation RLMTableRowView
-
-- (BOOL)isOpaque
-{
-    return YES;
-}
-
-@end
diff --git a/RealmBrowser/Views/RLMTableView.m b/RealmBrowser/Views/RLMTableView.m
index 19c2dab..1eee699 100644
--- a/RealmBrowser/Views/RLMTableView.m
+++ b/RealmBrowser/Views/RLMTableView.m
@@ -464,6 +464,7 @@ - (void)setupColumnsWithType:(RLMTypeNode *)typeNode
         headerCell.firstLine = propertyColumn.name;
         headerCell.secondLine = [RLMDescriptions typeNameOfProperty:propertyColumn.property];
         tableColumn.headerCell = headerCell;
+        tableColumn.minWidth = 26.0;
         
         tableColumn.headerToolTip = [self.realmDataSource headerToolTipForColumn:propertyColumn];
         [self addTableColumn:tableColumn];