diff --git a/Resources/Base.lproj/Main.storyboard b/Resources/Base.lproj/Main.storyboard
index f9193ab..4f3adbd 100644
--- a/Resources/Base.lproj/Main.storyboard
+++ b/Resources/Base.lproj/Main.storyboard
@@ -828,7 +828,6 @@
                         <outlet property="hideButton" destination="NZ2-Rj-S0K" id="hsS-Og-d6O"/>
                         <outlet property="positionSelection" destination="oD1-QX-ic8" id="DCe-KA-AzW"/>
                         <outlet property="showButton" destination="cac-mV-M5P" id="CUO-Bm-LWz"/>
-                        <outlet property="showHideButton" destination="cac-mV-M5P" id="8J3-xd-wp0"/>
                         <outlet property="windowTypeSelection" destination="wky-yL-dqd" id="DRF-oV-CJn"/>
                     </connections>
                 </viewController>
diff --git a/Sources/ContentViewController.swift b/Sources/ContentViewController.swift
index 4da4337..a68679c 100644
--- a/Sources/ContentViewController.swift
+++ b/Sources/ContentViewController.swift
@@ -10,4 +10,18 @@ import AppKit
 
 class ContentViewController: NSViewController {
     
+    // MARK: - Initialization
+
+    override init!(nibName nibNameOrNil: String?, bundle nibBundleOrNil: NSBundle?) {
+        super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil)
+    }
+    
+    convenience override init() {
+        self.init(nibName: "ContentViewController", bundle: nil)
+    }
+
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
 }
diff --git a/Sources/MainViewController.swift b/Sources/MainViewController.swift
index df78504..553c465 100644
--- a/Sources/MainViewController.swift
+++ b/Sources/MainViewController.swift
@@ -24,7 +24,7 @@ class MainViewController: NSViewController, NSPopoverDelegate {
     lazy var popover: NSPopover = {
         let popover = NSPopover()
         popover.behavior = .Semitransient
-        popover.contentViewController = ContentViewController(nibName: "ContentViewController", bundle: nil)!
+        popover.contentViewController = ContentViewController()
         popover.delegate = self
         return popover
     }()
@@ -33,7 +33,7 @@ class MainViewController: NSViewController, NSPopoverDelegate {
     
     lazy var detachedWindowController: DetachedWindowController = {
         let detachedWindowController = DetachedWindowController(windowNibName: "DetachedWindowController")
-        detachedWindowController.contentViewController = ContentViewController(nibName: "ContentViewController", bundle: nil)!
+        detachedWindowController.contentViewController = ContentViewController()
         
         self.detachedWindowControllerLoaded = true
         NSNotificationCenter.defaultCenter().addObserver(self, selector: "detachedWindowWillClose:", name: NSWindowWillCloseNotification, object: detachedWindowController.window)