diff --git a/Evergreen/FeedList/FeedListWindow.xib b/Evergreen/FeedList/FeedListWindow.xib
index 3e3250dd4..d48f2a1df 100644
--- a/Evergreen/FeedList/FeedListWindow.xib
+++ b/Evergreen/FeedList/FeedListWindow.xib
@@ -12,28 +12,30 @@
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <window title="Feed Directory" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" frameAutosaveName="FeedListWindow" animationBehavior="default" tabbingIdentifier="feedList" id="QvC-M9-y7g">
+        <window title="Feed Directory" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" frameAutosaveName="FeedListWindow" animationBehavior="default" tabbingIdentifier="feedListWindow" id="QvC-M9-y7g">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
-            <rect key="contentRect" x="196" y="240" width="480" height="270"/>
+            <rect key="contentRect" x="196" y="240" width="480" height="320"/>
             <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
+            <value key="minSize" type="size" width="480" height="320"/>
+            <value key="maxSize" type="size" width="1024" height="2048"/>
             <view key="contentView" wantsLayer="YES" id="EiT-Mj-1SZ">
-                <rect key="frame" x="0.0" y="0.0" width="480" height="270"/>
+                <rect key="frame" x="0.0" y="0.0" width="480" height="320"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <splitView arrangesAllSubviews="NO" dividerStyle="thin" vertical="YES" translatesAutoresizingMaskIntoConstraints="NO" id="LmW-op-ndf">
-                        <rect key="frame" x="0.0" y="32" width="480" height="238"/>
+                    <splitView identifier="feedListSplitView" arrangesAllSubviews="NO" autosaveName="FeedListSplitView" dividerStyle="thin" vertical="YES" translatesAutoresizingMaskIntoConstraints="NO" id="LmW-op-ndf">
+                        <rect key="frame" x="0.0" y="32" width="480" height="288"/>
                         <subviews>
                             <visualEffectView appearanceType="vibrantLight" blendingMode="behindWindow" material="appearanceBased" state="followsWindowActiveState" id="fSs-xC-S8k">
-                                <rect key="frame" x="0.0" y="0.0" width="128" height="238"/>
+                                <rect key="frame" x="0.0" y="0.0" width="128" height="288"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                 <subviews>
                                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="Sxr-eg-boM">
-                                        <rect key="frame" x="0.0" y="190" width="128" height="48"/>
+                                        <rect key="frame" x="0.0" y="240" width="128" height="48"/>
                                         <subviews>
                                             <searchField wantsLayer="YES" verticalHuggingPriority="750" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="791-YX-E38">
                                                 <rect key="frame" x="20" y="13" width="88" height="22"/>
-                                                <searchFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" borderStyle="bezel" usesSingleLineMode="YES" bezelStyle="round" id="R5K-If-i2f">
+                                                <searchFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" allowsUndo="NO" borderStyle="bezel" placeholderString="Filter" usesSingleLineMode="YES" bezelStyle="round" sendsSearchStringImmediately="YES" sendsWholeSearchString="YES" id="R5K-If-i2f">
                                                     <font key="font" metaFont="system"/>
                                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -53,21 +55,20 @@
                                             <constraint firstAttribute="trailing" secondItem="wey-fS-dNY" secondAttribute="trailing" id="xao-N6-CQq"/>
                                         </constraints>
                                     </customView>
-                                    <scrollView fixedFrame="YES" borderType="none" autohidesScrollers="YES" horizontalLineScroll="26" horizontalPageScroll="10" verticalLineScroll="26" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" horizontalScrollElasticity="none" translatesAutoresizingMaskIntoConstraints="NO" id="OF2-9S-uq1">
-                                        <rect key="frame" x="-11" y="-81" width="150" height="400"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                        <clipView key="contentView" ambiguous="YES" drawsBackground="NO" id="tIe-rZ-QVh">
-                                            <rect key="frame" x="0.0" y="0.0" width="150" height="400"/>
+                                    <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="26" horizontalPageScroll="10" verticalLineScroll="26" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" horizontalScrollElasticity="none" translatesAutoresizingMaskIntoConstraints="NO" id="OF2-9S-uq1">
+                                        <rect key="frame" x="0.0" y="0.0" width="128" height="240"/>
+                                        <clipView key="contentView" drawsBackground="NO" id="tIe-rZ-QVh">
+                                            <rect key="frame" x="0.0" y="0.0" width="128" height="240"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <subviews>
-                                                <outlineView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" selectionHighlightStyle="sourceList" columnReordering="NO" autosaveColumns="NO" rowHeight="24" rowSizeStyle="automatic" viewBased="YES" floatsGroupRows="NO" indentationPerLevel="16" outlineTableColumn="DDG-fw-BOq" id="QFz-zl-L9q">
-                                                    <rect key="frame" x="0.0" y="0.0" width="150" height="400"/>
+                                                <outlineView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" selectionHighlightStyle="sourceList" columnReordering="NO" autosaveColumns="NO" rowHeight="24" rowSizeStyle="medium" viewBased="YES" floatsGroupRows="NO" indentationPerLevel="16" outlineTableColumn="DDG-fw-BOq" id="QFz-zl-L9q">
+                                                    <rect key="frame" x="0.0" y="0.0" width="128" height="240"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <size key="intercellSpacing" width="3" height="2"/>
                                                     <color key="backgroundColor" name="_sourceListBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                     <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                                     <tableColumns>
-                                                        <tableColumn identifier="" width="147" minWidth="16" maxWidth="1000" id="DDG-fw-BOq">
+                                                        <tableColumn identifier="" width="125" minWidth="16" maxWidth="1000" id="DDG-fw-BOq">
                                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border">
                                                                 <font key="font" metaFont="smallSystem"/>
                                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -81,11 +82,11 @@
                                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                                             <prototypeCellViews>
                                                                 <tableCellView identifier="HeaderCell" id="rPF-Th-5l6">
-                                                                    <rect key="frame" x="1" y="1" width="147" height="17"/>
+                                                                    <rect key="frame" x="1" y="1" width="125" height="17"/>
                                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                                     <subviews>
                                                                         <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Fp1-HX-EM4">
-                                                                            <rect key="frame" x="0.0" y="1" width="147" height="14"/>
+                                                                            <rect key="frame" x="0.0" y="1" width="125" height="14"/>
                                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                                             <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="HEADER CELL" id="1Rz-3S-1vv">
                                                                                 <font key="font" metaFont="smallSystemBold"/>
@@ -98,8 +99,8 @@
                                                                         <outlet property="textField" destination="Fp1-HX-EM4" id="UQs-tV-3wl"/>
                                                                     </connections>
                                                                 </tableCellView>
-                                                                <tableCellView identifier="DataCell" id="oo8-3R-9Qa">
-                                                                    <rect key="frame" x="1" y="20" width="147" height="17"/>
+                                                                <tableCellView identifier="FeedListCell" id="oo8-3R-9Qa" customClass="SidebarCell" customModule="Evergreen" customModuleProvider="target">
+                                                                    <rect key="frame" x="1" y="20" width="125" height="17"/>
                                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                                     <subviews>
                                                                         <imageView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ddF-Kr-ft0">
@@ -108,7 +109,7 @@
                                                                             <imageCell key="cell" refusesFirstResponder="YES" imageScaling="proportionallyDown" image="NSActionTemplate" id="HgG-Pt-2z7"/>
                                                                         </imageView>
                                                                         <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Flq-o4-dtm">
-                                                                            <rect key="frame" x="25" y="0.0" width="122" height="17"/>
+                                                                            <rect key="frame" x="25" y="0.0" width="100" height="17"/>
                                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                                             <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="Wuw-uU-GVp">
                                                                                 <font key="font" metaFont="system"/>
@@ -125,6 +126,10 @@
                                                             </prototypeCellViews>
                                                         </tableColumn>
                                                     </tableColumns>
+                                                    <connections>
+                                                        <outlet property="dataSource" destination="PaK-f7-LwO" id="rCV-PC-qeS"/>
+                                                        <outlet property="delegate" destination="PaK-f7-LwO" id="1bE-cF-kNW"/>
+                                                    </connections>
                                                 </outlineView>
                                             </subviews>
                                             <nil key="backgroundColor"/>
@@ -134,7 +139,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                         </scroller>
                                         <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="3bs-fU-WVz">
-                                            <rect key="frame" x="224" y="17" width="15" height="102"/>
+                                            <rect key="frame" x="-16" y="0.0" width="16" height="0.0"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                         </scroller>
                                     </scrollView>
@@ -142,11 +147,15 @@
                                 <constraints>
                                     <constraint firstItem="Sxr-eg-boM" firstAttribute="top" secondItem="fSs-xC-S8k" secondAttribute="top" id="JY1-JZ-cuJ"/>
                                     <constraint firstAttribute="trailing" secondItem="Sxr-eg-boM" secondAttribute="trailing" id="JxU-8e-12v"/>
+                                    <constraint firstAttribute="bottom" secondItem="OF2-9S-uq1" secondAttribute="bottom" id="aqg-cT-TaC"/>
+                                    <constraint firstItem="OF2-9S-uq1" firstAttribute="leading" secondItem="fSs-xC-S8k" secondAttribute="leading" id="c5o-Kb-QD5"/>
+                                    <constraint firstAttribute="trailing" secondItem="OF2-9S-uq1" secondAttribute="trailing" id="gtT-Vf-xJy"/>
                                     <constraint firstItem="Sxr-eg-boM" firstAttribute="leading" secondItem="fSs-xC-S8k" secondAttribute="leading" id="rb4-70-MGe"/>
+                                    <constraint firstItem="OF2-9S-uq1" firstAttribute="top" secondItem="Sxr-eg-boM" secondAttribute="bottom" id="vSF-na-noD"/>
                                 </constraints>
                             </visualEffectView>
                             <customView fixedFrame="YES" id="asI-cc-kYO">
-                                <rect key="frame" x="129" y="0.0" width="351" height="238"/>
+                                <rect key="frame" x="129" y="0.0" width="351" height="288"/>
                                 <autoresizingMask key="autoresizingMask"/>
                             </customView>
                         </subviews>
@@ -160,7 +169,7 @@
                         <subviews>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="U53-Bq-HP2">
                                 <rect key="frame" x="20" y="3" width="120" height="25"/>
-                                <buttonCell key="cell" type="roundTextured" title="Subscribe" bezelStyle="texturedRounded" alignment="center" lineBreakMode="truncatingTail" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="7OU-tA-nCD">
+                                <buttonCell key="cell" type="roundTextured" title="Add to Feeds" bezelStyle="texturedRounded" alignment="center" lineBreakMode="truncatingTail" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="7OU-tA-nCD">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
                                 </buttonCell>
@@ -195,7 +204,16 @@
                 </constraints>
             </view>
             <contentBorderThickness minY="32"/>
+            <connections>
+                <outlet property="initialFirstResponder" destination="791-YX-E38" id="COm-7H-yRn"/>
+            </connections>
         </window>
+        <viewController id="PaK-f7-LwO" customClass="FeedListViewController" customModule="Evergreen" customModuleProvider="target">
+            <connections>
+                <outlet property="outlineView" destination="QFz-zl-L9q" id="kXs-PQ-ozV"/>
+                <outlet property="view" destination="OF2-9S-uq1" id="yfP-zX-T6z"/>
+            </connections>
+        </viewController>
     </objects>
     <resources>
         <image name="NSActionTemplate" width="14" height="14"/>