diff --git a/apple/OSX/Settings.xib b/apple/OSX/Settings.xib
index 98f95c9a53..1d5c744237 100644
--- a/apple/OSX/Settings.xib
+++ b/apple/OSX/Settings.xib
@@ -15,10 +15,12 @@
 			<string>NSButton</string>
 			<string>NSButtonCell</string>
 			<string>NSCustomObject</string>
+			<string>NSOutlineView</string>
 			<string>NSScrollView</string>
 			<string>NSScroller</string>
 			<string>NSTableCellView</string>
 			<string>NSTableColumn</string>
+			<string>NSTableHeaderView</string>
 			<string>NSTableView</string>
 			<string>NSTextField</string>
 			<string>NSTextFieldCell</string>
@@ -84,6 +86,7 @@
 											</object>
 											<array class="NSMutableArray" key="NSTableColumns">
 												<object class="NSTableColumn" id="846241792">
+													<string key="NSIdentifier">title</string>
 													<double key="NSWidth">145</double>
 													<double key="NSMinWidth">40</double>
 													<double key="NSMaxWidth">1000</double>
@@ -91,7 +94,7 @@
 														<int key="NSCellFlags">75497536</int>
 														<int key="NSCellFlags2">2048</int>
 														<string key="NSContents"/>
-														<object class="NSFont" key="NSSupport">
+														<object class="NSFont" key="NSSupport" id="26">
 															<string key="NSName">LucidaGrande</string>
 															<double key="NSSize">11</double>
 															<int key="NSfFlags">3100</int>
@@ -100,7 +103,7 @@
 															<int key="NSColorSpace">3</int>
 															<bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes>
 														</object>
-														<object class="NSColor" key="NSTextColor">
+														<object class="NSColor" key="NSTextColor" id="255729133">
 															<int key="NSColorSpace">6</int>
 															<string key="NSCatalogName">System</string>
 															<string key="NSColorName">headerTextColor</string>
@@ -138,17 +141,21 @@
 													</object>
 													<int key="NSResizingMask">3</int>
 													<bool key="NSIsResizeable">YES</bool>
-													<bool key="NSIsEditable">YES</bool>
 													<reference key="NSTableView" ref="223530966"/>
+													<object class="NSSortDescriptor" key="NSSortDescriptorPrototype">
+														<string key="NSKey">key</string>
+														<bool key="NSAscending">YES</bool>
+														<string key="NSSelector">compare:</string>
+													</object>
 												</object>
 											</array>
 											<double key="NSIntercellSpacingWidth">3</double>
 											<double key="NSIntercellSpacingHeight">2</double>
-											<object class="NSColor" key="NSBackgroundColor">
+											<object class="NSColor" key="NSBackgroundColor" id="1031424908">
 												<int key="NSColorSpace">3</int>
 												<bytes key="NSWhite">MQA</bytes>
 											</object>
-											<object class="NSColor" key="NSGridColor">
+											<object class="NSColor" key="NSGridColor" id="961535139">
 												<int key="NSColorSpace">6</int>
 												<string key="NSCatalogName">System</string>
 												<string key="NSColorName">gridColor</string>
@@ -158,7 +165,7 @@
 												</object>
 											</object>
 											<double key="NSRowHeight">17</double>
-											<int key="NSTvFlags">373293056</int>
+											<int key="NSTvFlags">104857600</int>
 											<reference key="NSDelegate"/>
 											<reference key="NSDataSource"/>
 											<int key="NSColumnAutoresizingStyle">4</int>
@@ -197,7 +204,7 @@
 									<string key="NSFrame">{{1, 119}, {223, 15}}</string>
 									<reference key="NSSuperview" ref="74170807"/>
 									<reference key="NSWindow"/>
-									<reference key="NSNextKeyView" ref="545473914"/>
+									<reference key="NSNextKeyView" ref="46895506"/>
 									<string key="NSReuseIdentifierKey">_NS:60</string>
 									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 									<int key="NSsFlags">1</int>
@@ -220,84 +227,10 @@
 							<double key="NSMaxMagnification">4</double>
 							<double key="NSMagnification">1</double>
 						</object>
-						<object class="NSScrollView" id="545473914">
-							<reference key="NSNextResponder" ref="1006"/>
-							<int key="NSvFlags">268</int>
-							<array class="NSMutableArray" key="NSSubviews">
-								<object class="NSClipView" id="637597222">
-									<reference key="NSNextResponder" ref="545473914"/>
-									<int key="NSvFlags">2304</int>
-									<array class="NSMutableArray" key="NSSubviews">
-										<object class="NSView" id="639704175">
-											<reference key="NSNextResponder" ref="637597222"/>
-											<int key="NSvFlags">274</int>
-											<string key="NSFrameSize">{471, 514}</string>
-											<reference key="NSSuperview" ref="637597222"/>
-											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="719201699"/>
-											<string key="NSReuseIdentifierKey">_NS:13</string>
-										</object>
-									</array>
-									<string key="NSFrame">{{1, 1}, {471, 514}}</string>
-									<reference key="NSSuperview" ref="545473914"/>
-									<reference key="NSWindow"/>
-									<reference key="NSNextKeyView" ref="639704175"/>
-									<string key="NSReuseIdentifierKey">_NS:11</string>
-									<reference key="NSDocView" ref="639704175"/>
-									<object class="NSColor" key="NSBGColor" id="838999407">
-										<int key="NSColorSpace">6</int>
-										<string key="NSCatalogName">System</string>
-										<string key="NSColorName">controlColor</string>
-										<reference key="NSColor" ref="618044500"/>
-									</object>
-									<int key="NScvFlags">4</int>
-								</object>
-								<object class="NSScroller" id="141590391">
-									<reference key="NSNextResponder" ref="545473914"/>
-									<int key="NSvFlags">256</int>
-									<string key="NSFrame">{{456, 1}, {16, 514}}</string>
-									<reference key="NSSuperview" ref="545473914"/>
-									<reference key="NSWindow"/>
-									<reference key="NSNextKeyView"/>
-									<string key="NSReuseIdentifierKey">_NS:15</string>
-									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-									<reference key="NSTarget" ref="545473914"/>
-									<string key="NSAction">_doScroller:</string>
-									<double key="NSCurValue">1</double>
-									<double key="NSPercent">0.96363627910614014</double>
-								</object>
-								<object class="NSScroller" id="719201699">
-									<reference key="NSNextResponder" ref="545473914"/>
-									<int key="NSvFlags">256</int>
-									<string key="NSFrame">{{1, 499}, {471, 16}}</string>
-									<reference key="NSSuperview" ref="545473914"/>
-									<reference key="NSWindow"/>
-									<reference key="NSNextKeyView" ref="141590391"/>
-									<string key="NSReuseIdentifierKey">_NS:26</string>
-									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-									<int key="NSsFlags">1</int>
-									<reference key="NSTarget" ref="545473914"/>
-									<string key="NSAction">_doScroller:</string>
-									<double key="NSPercent">0.50602412223815918</double>
-								</object>
-							</array>
-							<string key="NSFrame">{{178, 61}, {473, 516}}</string>
-							<reference key="NSSuperview" ref="1006"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="637597222"/>
-							<string key="NSReuseIdentifierKey">_NS:9</string>
-							<int key="NSsFlags">133170</int>
-							<reference key="NSVScroller" ref="141590391"/>
-							<reference key="NSHScroller" ref="719201699"/>
-							<reference key="NSContentView" ref="637597222"/>
-							<double key="NSMinMagnification">0.25</double>
-							<double key="NSMaxMagnification">4</double>
-							<double key="NSMagnification">1</double>
-						</object>
 						<object class="NSButton" id="630134028">
 							<reference key="NSNextResponder" ref="1006"/>
 							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{575, 13}, {82, 32}}</string>
+							<string key="NSFrame">{{582, 13}, {75, 32}}</string>
 							<reference key="NSSuperview" ref="1006"/>
 							<reference key="NSWindow"/>
 							<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -318,6 +251,184 @@
 							</object>
 							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
+						<object class="NSScrollView" id="46895506">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<array class="NSMutableArray" key="NSSubviews">
+								<object class="NSClipView" id="119087162">
+									<reference key="NSNextResponder" ref="46895506"/>
+									<int key="NSvFlags">2304</int>
+									<array class="NSMutableArray" key="NSSubviews">
+										<object class="NSOutlineView" id="962679450">
+											<reference key="NSNextResponder" ref="119087162"/>
+											<int key="NSvFlags">256</int>
+											<array class="NSMutableArray" key="NSSubviews"/>
+											<string key="NSFrameSize">{471, 498}</string>
+											<reference key="NSSuperview" ref="119087162"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="877229867"/>
+											<string key="NSReuseIdentifierKey">_NS:13</string>
+											<bool key="NSEnabled">YES</bool>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+											<bool key="NSControlAllowsExpansionToolTips">YES</bool>
+											<object class="NSTableHeaderView" key="NSHeaderView" id="95545597">
+												<reference key="NSNextResponder" ref="487176444"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrameSize">{471, 17}</string>
+												<reference key="NSSuperview" ref="487176444"/>
+												<reference key="NSWindow"/>
+												<reference key="NSNextKeyView" ref="119087162"/>
+												<reference key="NSTableView" ref="962679450"/>
+											</object>
+											<object class="_NSCornerView" key="NSCornerView">
+												<nil key="NSNextResponder"/>
+												<int key="NSvFlags">-2147483392</int>
+												<string key="NSFrame">{{224, 0}, {16, 17}}</string>
+												<reference key="NSNextKeyView" ref="119087162"/>
+												<string key="NSReuseIdentifierKey">_NS:18</string>
+											</object>
+											<array class="NSMutableArray" key="NSTableColumns">
+												<object class="NSTableColumn" id="608751962">
+													<string key="NSIdentifier">title</string>
+													<double key="NSWidth">101</double>
+													<double key="NSMinWidth">16</double>
+													<double key="NSMaxWidth">1000</double>
+													<object class="NSTableHeaderCell" key="NSHeaderCell">
+														<int key="NSCellFlags">75497536</int>
+														<int key="NSCellFlags2">2048</int>
+														<string key="NSContents"/>
+														<reference key="NSSupport" ref="26"/>
+														<object class="NSColor" key="NSBackgroundColor" id="240255362">
+															<int key="NSColorSpace">3</int>
+															<bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes>
+														</object>
+														<reference key="NSTextColor" ref="255729133"/>
+													</object>
+													<object class="NSTextFieldCell" key="NSDataCell" id="443600383">
+														<int key="NSCellFlags">337641536</int>
+														<int key="NSCellFlags2">2048</int>
+														<string key="NSContents">Text Cell</string>
+														<reference key="NSSupport" ref="893645100"/>
+														<reference key="NSControlView" ref="962679450"/>
+														<reference key="NSBackgroundColor" ref="348195430"/>
+														<reference key="NSTextColor" ref="342788135"/>
+													</object>
+													<int key="NSResizingMask">3</int>
+													<bool key="NSIsResizeable">YES</bool>
+													<bool key="NSIsEditable">YES</bool>
+													<reference key="NSTableView" ref="962679450"/>
+												</object>
+												<object class="NSTableColumn" id="186493342">
+													<string key="NSIdentifier">accessory</string>
+													<double key="NSWidth">364</double>
+													<double key="NSMinWidth">40</double>
+													<double key="NSMaxWidth">1000</double>
+													<object class="NSTableHeaderCell" key="NSHeaderCell">
+														<int key="NSCellFlags">75497536</int>
+														<int key="NSCellFlags2">2048</int>
+														<string key="NSContents"/>
+														<reference key="NSSupport" ref="26"/>
+														<reference key="NSBackgroundColor" ref="240255362"/>
+														<reference key="NSTextColor" ref="255729133"/>
+													</object>
+													<object class="NSTextFieldCell" key="NSDataCell" id="482758307">
+														<int key="NSCellFlags">337641536</int>
+														<int key="NSCellFlags2">2048</int>
+														<string key="NSContents">Text Cell</string>
+														<reference key="NSSupport" ref="893645100"/>
+														<reference key="NSControlView" ref="962679450"/>
+														<reference key="NSBackgroundColor" ref="348195430"/>
+														<reference key="NSTextColor" ref="342788135"/>
+													</object>
+													<int key="NSResizingMask">3</int>
+													<bool key="NSIsResizeable">YES</bool>
+													<bool key="NSIsEditable">YES</bool>
+													<reference key="NSTableView" ref="962679450"/>
+												</object>
+											</array>
+											<double key="NSIntercellSpacingWidth">3</double>
+											<double key="NSIntercellSpacingHeight">2</double>
+											<reference key="NSBackgroundColor" ref="1031424908"/>
+											<reference key="NSGridColor" ref="961535139"/>
+											<double key="NSRowHeight">17</double>
+											<int key="NSTvFlags">306216960</int>
+											<reference key="NSDelegate"/>
+											<reference key="NSDataSource"/>
+											<int key="NSColumnAutoresizingStyle">1</int>
+											<int key="NSDraggingSourceMaskForLocal">15</int>
+											<int key="NSDraggingSourceMaskForNonLocal">0</int>
+											<bool key="NSAllowsTypeSelect">YES</bool>
+											<int key="NSTableViewDraggingDestinationStyle">0</int>
+											<int key="NSTableViewGroupRowStyle">1</int>
+											<bool key="NSOutlineViewAutoresizesOutlineColumnKey">NO</bool>
+										</object>
+									</array>
+									<string key="NSFrame">{{1, 17}, {471, 498}}</string>
+									<reference key="NSSuperview" ref="46895506"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="962679450"/>
+									<string key="NSReuseIdentifierKey">_NS:11</string>
+									<reference key="NSDocView" ref="962679450"/>
+									<reference key="NSBGColor" ref="348195430"/>
+									<int key="NScvFlags">4</int>
+								</object>
+								<object class="NSScroller" id="899143711">
+									<reference key="NSNextResponder" ref="46895506"/>
+									<int key="NSvFlags">-2147483392</int>
+									<string key="NSFrame">{{224, 17}, {15, 102}}</string>
+									<reference key="NSSuperview" ref="46895506"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="366883407"/>
+									<string key="NSReuseIdentifierKey">_NS:58</string>
+									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+									<reference key="NSTarget" ref="46895506"/>
+									<string key="NSAction">_doScroller:</string>
+									<double key="NSPercent">0.99799599198396793</double>
+								</object>
+								<object class="NSScroller" id="366883407">
+									<reference key="NSNextResponder" ref="46895506"/>
+									<int key="NSvFlags">-2147483392</int>
+									<string key="NSFrame">{{1, 499}, {471, 16}}</string>
+									<reference key="NSSuperview" ref="46895506"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="630134028"/>
+									<string key="NSReuseIdentifierKey">_NS:60</string>
+									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+									<int key="NSsFlags">1</int>
+									<reference key="NSTarget" ref="46895506"/>
+									<string key="NSAction">_doScroller:</string>
+									<double key="NSPercent">0.82055749128919864</double>
+								</object>
+								<object class="NSClipView" id="487176444">
+									<reference key="NSNextResponder" ref="46895506"/>
+									<int key="NSvFlags">2304</int>
+									<array class="NSMutableArray" key="NSSubviews">
+										<reference ref="95545597"/>
+									</array>
+									<string key="NSFrame">{{1, 0}, {471, 17}}</string>
+									<reference key="NSSuperview" ref="46895506"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="95545597"/>
+									<reference key="NSDocView" ref="95545597"/>
+									<reference key="NSBGColor" ref="348195430"/>
+									<int key="NScvFlags">4</int>
+								</object>
+							</array>
+							<string key="NSFrame">{{178, 61}, {473, 516}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="487176444"/>
+							<string key="NSReuseIdentifierKey">_NS:9</string>
+							<int key="NSsFlags">133682</int>
+							<reference key="NSVScroller" ref="899143711"/>
+							<reference key="NSHScroller" ref="366883407"/>
+							<reference key="NSContentView" ref="119087162"/>
+							<reference key="NSHeaderClipView" ref="487176444"/>
+							<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
+							<double key="NSMinMagnification">0.25</double>
+							<double key="NSMaxMagnification">4</double>
+							<double key="NSMagnification">1</double>
+						</object>
 					</array>
 					<string key="NSFrameSize">{671, 597}</string>
 					<reference key="NSSuperview"/>
@@ -366,14 +477,6 @@
 					</object>
 					<int key="connectionID">104</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">_scroller</string>
-						<reference key="source" ref="897541637"/>
-						<reference key="destination" ref="545473914"/>
-					</object>
-					<int key="connectionID">114</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">close:</string>
@@ -382,6 +485,14 @@
 					</object>
 					<int key="connectionID">122</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">_outline</string>
+						<reference key="source" ref="897541637"/>
+						<reference key="destination" ref="962679450"/>
+					</object>
+					<int key="connectionID">180</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">textField</string>
@@ -403,7 +514,12 @@
 										<string key="NSContents">Table View Cell</string>
 										<reference key="NSSupport" ref="893645100"/>
 										<reference key="NSControlView" ref="556255854"/>
-										<reference key="NSBackgroundColor" ref="838999407"/>
+										<object class="NSColor" key="NSBackgroundColor" id="838999407">
+											<int key="NSColorSpace">6</int>
+											<string key="NSCatalogName">System</string>
+											<string key="NSColorName">controlColor</string>
+											<reference key="NSColor" ref="618044500"/>
+										</object>
 										<reference key="NSTextColor" ref="342788135"/>
 									</object>
 									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
@@ -416,6 +532,90 @@
 					</object>
 					<int key="connectionID">108</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">dataSource</string>
+						<reference key="source" ref="962679450"/>
+						<reference key="destination" ref="897541637"/>
+					</object>
+					<int key="connectionID">181</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="962679450"/>
+						<reference key="destination" ref="897541637"/>
+					</object>
+					<int key="connectionID">182</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">textField</string>
+						<object class="NSTableCellView" key="source" id="877229867">
+							<nil key="NSNextResponder"/>
+							<int key="NSvFlags">274</int>
+							<array class="NSMutableArray" key="NSSubviews">
+								<object class="NSTextField" id="523975582">
+									<reference key="NSNextResponder" ref="877229867"/>
+									<int key="NSvFlags">266</int>
+									<string key="NSFrameSize">{101, 17}</string>
+									<reference key="NSSuperview" ref="877229867"/>
+									<reference key="NSNextKeyView" ref="77832011"/>
+									<string key="NSAntiCompressionPriority">{250, 750}</string>
+									<bool key="NSEnabled">YES</bool>
+									<object class="NSTextFieldCell" key="NSCell" id="734768720">
+										<int key="NSCellFlags">67108928</int>
+										<int key="NSCellFlags2">272631808</int>
+										<string key="NSContents">Table View Cell</string>
+										<reference key="NSSupport" ref="893645100"/>
+										<reference key="NSControlView" ref="523975582"/>
+										<reference key="NSBackgroundColor" ref="838999407"/>
+										<reference key="NSTextColor" ref="342788135"/>
+									</object>
+									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+								</object>
+							</array>
+							<string key="NSFrame">{{1, 1}, {101, 17}}</string>
+							<reference key="NSNextKeyView" ref="523975582"/>
+						</object>
+						<reference key="destination" ref="523975582"/>
+					</object>
+					<int key="connectionID">168</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">textField</string>
+						<object class="NSTableCellView" key="source" id="77832011">
+							<nil key="NSNextResponder"/>
+							<int key="NSvFlags">274</int>
+							<array class="NSMutableArray" key="NSSubviews">
+								<object class="NSTextField" id="146951220">
+									<reference key="NSNextResponder" ref="77832011"/>
+									<int key="NSvFlags">266</int>
+									<string key="NSFrameSize">{364, 17}</string>
+									<reference key="NSSuperview" ref="77832011"/>
+									<reference key="NSNextKeyView" ref="899143711"/>
+									<string key="NSAntiCompressionPriority">{250, 750}</string>
+									<bool key="NSEnabled">YES</bool>
+									<object class="NSTextFieldCell" key="NSCell" id="316554001">
+										<int key="NSCellFlags">67108928</int>
+										<int key="NSCellFlags2">272631808</int>
+										<string key="NSContents">Table View Cell</string>
+										<reference key="NSSupport" ref="893645100"/>
+										<reference key="NSControlView" ref="146951220"/>
+										<reference key="NSBackgroundColor" ref="838999407"/>
+										<reference key="NSTextColor" ref="342788135"/>
+									</object>
+									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+								</object>
+							</array>
+							<string key="NSFrame">{{105, 1}, {364, 17}}</string>
+							<reference key="NSNextKeyView" ref="146951220"/>
+						</object>
+						<reference key="destination" ref="146951220"/>
+					</object>
+					<int key="connectionID">172</int>
+				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -455,20 +655,23 @@
 						<int key="objectID">2</int>
 						<reference key="object" ref="1006"/>
 						<array class="NSMutableArray" key="children">
-							<object class="IBNSLayoutConstraint" id="221987484">
-								<reference key="firstItem" ref="630134028"/>
-								<int key="firstAttribute">3</int>
+							<reference ref="630134028"/>
+							<reference ref="74170807"/>
+							<reference ref="46895506"/>
+							<object class="IBNSLayoutConstraint" id="10442957">
+								<reference key="firstItem" ref="1006"/>
+								<int key="firstAttribute">6</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="545473914"/>
-								<int key="secondAttribute">4</int>
+								<reference key="secondItem" ref="630134028"/>
+								<int key="secondAttribute">6</int>
 								<float key="multiplier">1</float>
 								<object class="IBNSLayoutSymbolicConstant" key="constant">
 									<double key="value">20</double>
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="1006"/>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
 							<object class="IBNSLayoutConstraint" id="847141628">
@@ -487,24 +690,24 @@
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="10442957">
-								<reference key="firstItem" ref="1006"/>
-								<int key="firstAttribute">6</int>
+							<object class="IBNSLayoutConstraint" id="221987484">
+								<reference key="firstItem" ref="630134028"/>
+								<int key="firstAttribute">3</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="630134028"/>
-								<int key="secondAttribute">6</int>
+								<reference key="secondItem" ref="46895506"/>
+								<int key="secondAttribute">4</int>
 								<float key="multiplier">1</float>
 								<object class="IBNSLayoutSymbolicConstant" key="constant">
 									<double key="value">20</double>
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="1006"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">3</int>
 							</object>
 							<object class="IBNSLayoutConstraint" id="414624954">
-								<reference key="firstItem" ref="545473914"/>
+								<reference key="firstItem" ref="46895506"/>
 								<int key="firstAttribute">4</int>
 								<int key="relation">0</int>
 								<reference key="secondItem" ref="74170807"/>
@@ -519,11 +722,11 @@
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">2</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="169572337">
+							<object class="IBNSLayoutConstraint" id="991201239">
 								<reference key="firstItem" ref="1006"/>
 								<int key="firstAttribute">6</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="545473914"/>
+								<reference key="secondItem" ref="46895506"/>
 								<int key="secondAttribute">6</int>
 								<float key="multiplier">1</float>
 								<object class="IBNSLayoutSymbolicConstant" key="constant">
@@ -535,24 +738,8 @@
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="749930481">
-								<reference key="firstItem" ref="545473914"/>
-								<int key="firstAttribute">3</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="1006"/>
-								<int key="secondAttribute">3</int>
-								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">20</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="1006"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
 							<object class="IBNSLayoutConstraint" id="582813510">
-								<reference key="firstItem" ref="545473914"/>
+								<reference key="firstItem" ref="46895506"/>
 								<int key="firstAttribute">5</int>
 								<int key="relation">0</int>
 								<reference key="secondItem" ref="1006"/>
@@ -567,8 +754,24 @@
 								<float key="scoringTypeFloat">9</float>
 								<int key="contentType">3</int>
 							</object>
+							<object class="IBNSLayoutConstraint" id="749930481">
+								<reference key="firstItem" ref="46895506"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="1006"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1006"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
 							<object class="IBNSLayoutConstraint" id="209942979">
-								<reference key="firstItem" ref="545473914"/>
+								<reference key="firstItem" ref="46895506"/>
 								<int key="firstAttribute">5</int>
 								<int key="relation">0</int>
 								<reference key="secondItem" ref="74170807"/>
@@ -583,7 +786,7 @@
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="30444387">
+							<object class="IBNSLayoutConstraint" id="165336697">
 								<reference key="firstItem" ref="74170807"/>
 								<int key="firstAttribute">3</int>
 								<int key="relation">0</int>
@@ -615,9 +818,6 @@
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
-							<reference ref="545473914"/>
-							<reference ref="630134028"/>
-							<reference ref="74170807"/>
 						</array>
 						<reference key="parent" ref="1005"/>
 					</object>
@@ -663,61 +863,6 @@
 						<reference key="object" ref="109586057"/>
 						<reference key="parent" ref="846241792"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">61</int>
-						<reference key="object" ref="377742960"/>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">63</int>
-						<reference key="object" ref="30444387"/>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">72</int>
-						<reference key="object" ref="545473914"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="639704175"/>
-							<reference ref="719201699"/>
-							<reference ref="141590391"/>
-						</array>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">73</int>
-						<reference key="object" ref="639704175"/>
-						<reference key="parent" ref="545473914"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">74</int>
-						<reference key="object" ref="719201699"/>
-						<reference key="parent" ref="545473914"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">75</int>
-						<reference key="object" ref="141590391"/>
-						<reference key="parent" ref="545473914"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">80</int>
-						<reference key="object" ref="209942979"/>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">83</int>
-						<reference key="object" ref="582813510"/>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">85</int>
-						<reference key="object" ref="749930481"/>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">87</int>
-						<reference key="object" ref="169572337"/>
-						<reference key="parent" ref="1006"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">99</int>
 						<reference key="object" ref="897541637"/>
@@ -792,21 +937,6 @@
 						<reference key="object" ref="656981319"/>
 						<reference key="parent" ref="556255854"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">109</int>
-						<reference key="object" ref="724005911"/>
-						<reference key="parent" ref="510547195"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">110</int>
-						<reference key="object" ref="255675372"/>
-						<reference key="parent" ref="510547195"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">111</int>
-						<reference key="object" ref="93784692"/>
-						<reference key="parent" ref="510547195"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">116</int>
 						<reference key="object" ref="630134028"/>
@@ -821,25 +951,280 @@
 						<reference key="parent" ref="630134028"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">118</int>
-						<reference key="object" ref="10442957"/>
+						<int key="objectID">148</int>
+						<reference key="object" ref="46895506"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="962679450"/>
+							<reference ref="366883407"/>
+							<reference ref="899143711"/>
+							<reference ref="95545597"/>
+						</array>
 						<reference key="parent" ref="1006"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">119</int>
-						<reference key="object" ref="847141628"/>
+						<int key="objectID">149</int>
+						<reference key="object" ref="962679450"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="608751962"/>
+							<reference ref="186493342"/>
+						</array>
+						<reference key="parent" ref="46895506"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">150</int>
+						<reference key="object" ref="366883407"/>
+						<reference key="parent" ref="46895506"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">152</int>
+						<reference key="object" ref="899143711"/>
+						<reference key="parent" ref="46895506"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">153</int>
+						<reference key="object" ref="608751962"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="443600383"/>
+							<reference ref="877229867"/>
+						</array>
+						<reference key="parent" ref="962679450"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">154</int>
+						<reference key="object" ref="186493342"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="482758307"/>
+							<reference ref="77832011"/>
+						</array>
+						<reference key="parent" ref="962679450"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">155</int>
+						<reference key="object" ref="482758307"/>
+						<reference key="parent" ref="186493342"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">156</int>
+						<reference key="object" ref="443600383"/>
+						<reference key="parent" ref="608751962"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">165</int>
+						<reference key="object" ref="877229867"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="523975582"/>
+							<object class="IBNSLayoutConstraint" id="456122395">
+								<reference key="firstItem" ref="523975582"/>
+								<int key="firstAttribute">10</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="877229867"/>
+								<int key="secondAttribute">10</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="877229867"/>
+								<int key="scoringType">5</int>
+								<float key="scoringTypeFloat">22</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="699406647">
+								<reference key="firstItem" ref="523975582"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="877229867"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">3</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="877229867"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+						</array>
+						<reference key="parent" ref="608751962"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">166</int>
+						<reference key="object" ref="523975582"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="734768720"/>
+						</array>
+						<reference key="parent" ref="877229867"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">167</int>
+						<reference key="object" ref="734768720"/>
+						<reference key="parent" ref="523975582"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">169</int>
+						<reference key="object" ref="77832011"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="146951220"/>
+							<object class="IBNSLayoutConstraint" id="413803480">
+								<reference key="firstItem" ref="77832011"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="146951220"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">3</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="77832011"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="939661010">
+								<reference key="firstItem" ref="146951220"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="77832011"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">3</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="77832011"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="301896927">
+								<reference key="firstItem" ref="146951220"/>
+								<int key="firstAttribute">10</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="77832011"/>
+								<int key="secondAttribute">10</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="77832011"/>
+								<int key="scoringType">5</int>
+								<float key="scoringTypeFloat">22</float>
+								<int key="contentType">2</int>
+							</object>
+						</array>
+						<reference key="parent" ref="186493342"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">170</int>
+						<reference key="object" ref="146951220"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="316554001"/>
+						</array>
+						<reference key="parent" ref="77832011"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">171</int>
+						<reference key="object" ref="316554001"/>
+						<reference key="parent" ref="146951220"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">179</int>
+						<reference key="object" ref="95545597"/>
+						<reference key="parent" ref="46895506"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">195</int>
+						<reference key="object" ref="209942979"/>
 						<reference key="parent" ref="1006"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">120</int>
+						<int key="objectID">196</int>
+						<reference key="object" ref="749930481"/>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">197</int>
+						<reference key="object" ref="582813510"/>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">198</int>
+						<reference key="object" ref="377742960"/>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">199</int>
 						<reference key="object" ref="221987484"/>
 						<reference key="parent" ref="1006"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">121</int>
+						<int key="objectID">200</int>
+						<reference key="object" ref="847141628"/>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">201</int>
+						<reference key="object" ref="991201239"/>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">202</int>
+						<reference key="object" ref="165336697"/>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">203</int>
 						<reference key="object" ref="414624954"/>
 						<reference key="parent" ref="1006"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">204</int>
+						<reference key="object" ref="10442957"/>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">205</int>
+						<reference key="object" ref="724005911"/>
+						<reference key="parent" ref="510547195"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">206</int>
+						<reference key="object" ref="255675372"/>
+						<reference key="parent" ref="510547195"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">207</int>
+						<reference key="object" ref="93784692"/>
+						<reference key="parent" ref="510547195"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">208</int>
+						<reference key="object" ref="699406647"/>
+						<reference key="parent" ref="877229867"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">209</int>
+						<reference key="object" ref="456122395"/>
+						<reference key="parent" ref="877229867"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">210</int>
+						<reference key="object" ref="301896927"/>
+						<reference key="parent" ref="77832011"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">211</int>
+						<reference key="object" ref="939661010"/>
+						<reference key="parent" ref="77832011"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">212</int>
+						<reference key="object" ref="413803480"/>
+						<reference key="parent" ref="77832011"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -858,29 +1243,76 @@
 				<boolean value="NO" key="106.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="106.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="107.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="109.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="110.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="111.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="NO" key="116.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="116.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="117.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="118.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="119.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="120.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="121.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<array class="NSMutableArray" key="2.IBNSViewMetadataConstraints">
+				<boolean value="NO" key="148.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="148.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="149.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="YES" key="149.ibExternalAutomaticallyCalculatesRowSizeFromViewHeight"/>
+				<string key="150.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="152.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="153.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="YES" key="153.isInViewBasedMode"/>
+				<array key="153.prototypeCellViews">
+					<reference ref="877229867"/>
+				</array>
+				<string key="154.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="YES" key="154.isInViewBasedMode"/>
+				<array key="154.prototypeCellViews">
+					<reference ref="77832011"/>
+				</array>
+				<string key="155.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="156.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array key="165.IBNSViewMetadataConstraints">
+					<reference ref="699406647"/>
+					<reference ref="456122395"/>
+				</array>
+				<string key="165.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="166.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="166.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="167.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array key="169.IBNSViewMetadataConstraints">
+					<reference ref="301896927"/>
+					<reference ref="939661010"/>
+					<reference ref="413803480"/>
+				</array>
+				<string key="169.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="170.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="170.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="171.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="179.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="195.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="196.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="197.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="198.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="199.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array key="2.IBNSViewMetadataConstraints">
 					<reference ref="377742960"/>
-					<reference ref="30444387"/>
+					<reference ref="165336697"/>
 					<reference ref="209942979"/>
-					<reference ref="582813510"/>
 					<reference ref="749930481"/>
-					<reference ref="169572337"/>
+					<reference ref="582813510"/>
+					<reference ref="991201239"/>
 					<reference ref="414624954"/>
-					<reference ref="10442957"/>
-					<reference ref="847141628"/>
 					<reference ref="221987484"/>
+					<reference ref="847141628"/>
+					<reference ref="10442957"/>
 				</array>
 				<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="200.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="201.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="202.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="203.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="204.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="205.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="206.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="207.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="208.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="209.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="210.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="211.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="212.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="NO" key="48.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="48.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="49.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -893,24 +1325,13 @@
 					<reference ref="510547195"/>
 				</array>
 				<string key="56.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="61.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="63.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="NO" key="72.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
-				<string key="72.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="73.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="74.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="75.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="80.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="83.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="85.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="87.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="99.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 			</dictionary>
 			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">122</int>
+			<int key="maxID">212</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -925,6 +1346,36 @@
 				<object class="IBPartialClassDescription">
 					<string key="className">RASettingsDelegate</string>
 					<string key="superclassName">NSObject</string>
+					<object class="NSMutableDictionary" key="actions">
+						<string key="NS.key.0">close:</string>
+						<string key="NS.object.0">id</string>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">close:</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">close:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="_outline">NSOutlineView</string>
+						<string key="_table">NSTableView</string>
+						<string key="_window">NSWindow</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="_outline">
+							<string key="name">_outline</string>
+							<string key="candidateClassName">NSOutlineView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="_table">
+							<string key="name">_table</string>
+							<string key="candidateClassName">NSTableView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="_window">
+							<string key="name">_window</string>
+							<string key="candidateClassName">NSWindow</string>
+						</object>
+					</dictionary>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
 						<string key="minorKey">./Classes/RASettingsDelegate.h</string>
diff --git a/apple/OSX/settings.m b/apple/OSX/settings.m
index e2f84fe837..4bebfb07ec 100644
--- a/apple/OSX/settings.m
+++ b/apple/OSX/settings.m
@@ -17,111 +17,64 @@
 #import "../RetroArch/RetroArch_Apple.h"
 #include "../RetroArch/setting_data.h"
 
-@interface RASettingsDelegate : NSObject<NSTableViewDataSource>
+@interface RASettingsDelegate : NSObject<NSTableViewDataSource,   NSTableViewDelegate,
+                                         NSOutlineViewDataSource, NSOutlineViewDelegate>
 @end
 
 @implementation RASettingsDelegate
 {
    NSWindow IBOutlet* _window;
-   NSScrollView IBOutlet* _scroller;
    NSTableView IBOutlet* _table;
+   NSOutlineView IBOutlet* _outline;
    
-   NSMutableArray* _groups;
+   NSMutableArray* _settings;
+   NSMutableArray* _currentGroup;
 }
 
 - (void)awakeFromNib
 {
-   _groups = [NSMutableArray array];
-
-   NSMatrix* mtx = nil;
-   NSMutableArray* subGroups = nil;
-
+   NSMutableArray* thisGroup = nil;
+   NSMutableArray* thisSubGroup = nil;
+   _settings = [NSMutableArray array];
+   
    for (int i = 0; setting_data[i].type; i ++)
    {
-      const rarch_setting_t* s = &setting_data[i];
-
-      if (s->type == ST_GROUP)
+      switch (setting_data[i].type)
       {
-         subGroups = [NSMutableArray array];
-         objc_setAssociatedObject(subGroups, "NAME", [NSString stringWithFormat:@"%s", s->name], OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-      }
-      else if(s->type == ST_END_GROUP)
-      {
-         NSView* view = [NSView new];
-         uint32_t height = 0;
-         
-         for (NSMatrix* mtx in subGroups)
-            height += mtx.frame.size.height + 20;
-         
-         view.frameSize = CGSizeMake(_scroller.frame.size.width, height);
-         
-         for (NSMatrix* mtx in subGroups)
+         case ST_GROUP:
          {
-            mtx.frameOrigin = CGPointMake(0, height - mtx.frame.size.height);
-            height -= mtx.frame.size.height + 20;
-            
-            NSBox* box = [[NSBox alloc] initWithFrame:mtx.frame];
-            box.title = objc_getAssociatedObject(mtx, "NAME");
-            box.contentView = mtx;
-            [view addSubview:box];
-         }
-
-         [_groups addObject:view];
-         objc_setAssociatedObject(view, "NAME", objc_getAssociatedObject(subGroups, "NAME"), OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-         subGroups = nil;
-      }
-      else if (s->type == ST_SUB_GROUP)
-      {
-         mtx = [[NSMatrix alloc] initWithFrame:CGRectMake(0, 0, 480, 480)
-                                 mode:NSHighlightModeMatrix
-                                 prototype:nil
-                                 numberOfRows:0
-                                 numberOfColumns:2];
-         mtx.cellSize = NSMakeSize(240, 20);
-         objc_setAssociatedObject(mtx, "NAME", [NSString stringWithFormat:@"%s", s->name], OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-      }
-      else if (s->type == ST_END_SUB_GROUP)
-      {
-         [mtx sizeToCells];
-         [subGroups addObject:mtx];
-         mtx = nil;
-      }
-      else
-      {
-         NSTextFieldCell* label = [[NSTextFieldCell alloc] initTextCell:[NSString stringWithFormat:@"%s", s->short_description]];
-         id accessory = nil;
-      
-         switch (s->type)
-         {
-            case ST_BOOL:
-            {
-               accessory = [NSButtonCell new];
-            
-               [accessory setButtonType:NSSwitchButton];
-               [accessory setState:*(bool*)s->value];
-               [accessory setTitle:@""];
-               break;
-            }
-         
-            case ST_STRING:
-            case ST_PATH:
-            case ST_INT:
-            case ST_FLOAT:
-            {
-               accessory = [NSTextFieldCell new];
-            
-               if (s->type == ST_INT)        [accessory setIntValue:*(int32_t*)s->value];
-               else if (s->type == ST_FLOAT) [accessory setFloatValue:*(float*)s->value];
-               else                          [accessory setTitle:[NSString stringWithFormat:@"%s", (const char*)s->value]];
-               break;
-            }
-         
-            default: abort();
+            thisGroup = [NSMutableArray array];
+            objc_setAssociatedObject(thisGroup, "NAME", [NSString stringWithFormat:@"%s", setting_data[i].name], OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+            break;
          }
          
-         [mtx addRowWithCells:[NSArray arrayWithObjects:label, accessory, nil]];
+         case ST_END_GROUP:
+         {
+            [_settings addObject:thisGroup];
+            thisGroup = nil;
+            break;
+         }
+         
+         case ST_SUB_GROUP:
+         {
+            thisSubGroup = [NSMutableArray array];
+            objc_setAssociatedObject(thisSubGroup, "NAME", [NSString stringWithFormat:@"%s", setting_data[i].name], OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+            break;
+         }
+         
+         case ST_END_SUB_GROUP:
+         {
+            [thisGroup addObject:thisSubGroup];
+            thisSubGroup = nil;
+            break;
+         }
+
+         default:
+         {
+            [thisSubGroup addObject:[NSNumber numberWithInt:i]];
+            break;
+         }
       }
-      
    }
    
    [NSApplication.sharedApplication beginSheet:_window modalForWindow:RetroArch_OSX.get->window modalDelegate:nil didEndSelector:nil contextInfo:nil];
@@ -135,29 +88,108 @@
    [_window orderOut:nil];
 }
 
+
+#pragma mark View Builders
+- (NSView*)labelAccessoryFor:(NSString*)text onTable:(NSTableView*)table
+{
+   NSTextField* result = [table makeViewWithIdentifier:@"label" owner:self];
+   if (result == nil)
+   {
+      result = [NSTextField new];
+      result.bordered = NO;
+      result.drawsBackground = NO;
+      result.identifier = @"label";
+   }
+ 
+   result.stringValue = text;
+   return result;
+}
+
+- (NSView*)booleanAccessoryFor:(const rarch_setting_t*)setting onTable:(NSTableView*)table
+{
+   NSButton* result = [table makeViewWithIdentifier:@"boolean" owner:self];
+   
+   if (!result)
+   {
+      result = [NSButton new];
+      result.buttonType = NSSwitchButton;
+      result.title = @"";
+   }
+   
+   result.state = *(bool*)setting->value;
+   return result;
+}
+
+#pragma mark Section Table
 - (NSInteger)numberOfRowsInTableView:(NSTableView*)view
 {
-   return _groups.count;
+   return _settings.count;
 }
 
 - (NSView *)tableView:(NSTableView *)tableView viewForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row
 {
-   NSTextField* result = [tableView makeViewWithIdentifier:@"category" owner:self];
-   if (result == nil)
-   {
-      result = [[NSTextField alloc] initWithFrame:CGRectMake(0, 0, 100, 10)];
-      result.bordered = NO;
-      result.drawsBackground = NO;
-      result.identifier = @"category";
-   }
- 
-   result.stringValue = objc_getAssociatedObject(_groups[row], "NAME");
-   return result;
+   return [self labelAccessoryFor:objc_getAssociatedObject(_settings[row], "NAME") onTable:tableView];
 }
 
 - (void)tableViewSelectionDidChange:(NSNotification *)aNotification
 {
-   _scroller.documentView = _groups[_table.selectedRow];
+   _currentGroup = _settings[_table.selectedRow];
+   [_outline reloadData];
+}
+
+#pragma mark Setting Outline
+- (NSInteger)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item
+{
+   return (item == nil) ? _currentGroup.count : [item count];
+}
+
+- (id)outlineView:(NSOutlineView *)outlineView child:(NSInteger)index ofItem:(id)item
+{
+   return (item == nil) ? _currentGroup[index] : [item objectAtIndex:index];
+}
+
+- (BOOL)outlineView:(NSOutlineView *)outlineView isItemExpandable:(id)item
+{
+   return [item isKindOfClass:[NSArray class]];
+}
+
+- (NSView *)outlineView:(NSOutlineView *)outlineView viewForTableColumn:(NSTableColumn *)tableColumn item:(id)item
+{
+   if ([item isKindOfClass:[NSArray class]])
+   {
+      if ([tableColumn.identifier isEqualToString:@"title"])
+         return [self labelAccessoryFor:objc_getAssociatedObject(item, "NAME") onTable:outlineView];
+      else
+         return [self labelAccessoryFor:[NSString stringWithFormat:@"%d items", (int)[item count]] onTable:outlineView];
+   }
+   else
+   {
+      const rarch_setting_t* setting = &setting_data[[item intValue]];
+
+      if ([tableColumn.identifier isEqualToString:@"title"])
+         return [self labelAccessoryFor:[NSString stringWithFormat:@"%s", setting->short_description] onTable:outlineView]; // < The outlineView will fill the value
+      else if([tableColumn.identifier isEqualToString:@"accessory"])
+      {
+         switch (setting->type)
+         {
+            case ST_BOOL: return [self booleanAccessoryFor:setting onTable:outlineView];
+         
+            case ST_PATH:
+            case ST_STRING:
+               return [self labelAccessoryFor:[NSString stringWithFormat:@"%s", (const char*)setting->value] onTable:outlineView];
+            
+            case ST_INT:
+               return [self labelAccessoryFor:[NSString stringWithFormat:@"%d", *(int*)setting->value] onTable:outlineView];
+
+            case ST_FLOAT:
+               return [self labelAccessoryFor:[NSString stringWithFormat:@"%f", *(float*)setting->value] onTable:outlineView];
+
+            default: abort();
+         }
+      }
+   }
+   
+   return nil;
 }
 
 @end