diff --git a/GetHip/FriendsListViewController.swift b/GetHip/FriendsListViewController.swift
index cfbcfd4..780eff4 100644
--- a/GetHip/FriendsListViewController.swift
+++ b/GetHip/FriendsListViewController.swift
@@ -18,7 +18,9 @@ class FriendsListViewController: UIViewController, UITableViewDelegate, UITableV
     
     @IBAction func dismissFriendView(sender: UIBarButtonItem) {
         
-        self.parentViewController?.dismissViewControllerAnimated(true, completion: nil)
+        self.parentViewController?.navigationController?.popViewControllerAnimated(true)
+        self.navigationController?.navigationBarHidden = false
+
     }
     @IBAction func addFriend(sender: UIBarButtonItem){
         self.performSegueWithIdentifier("FriendRequestSegue", sender: nil)
@@ -33,6 +35,7 @@ class FriendsListViewController: UIViewController, UITableViewDelegate, UITableV
         self.table.delegate = self
         self.table.dataSource = self
         self.title = "Friends"
+        self.navigationController?.navigationBarHidden = false
         //self.navigationItem.rightBarButtonItem = self.editButtonItem()
         //self.friends = manager.getFriends()
         
diff --git a/GetHip/Main.storyboard b/GetHip/Main.storyboard
index 8b1d8cc..fca3a3c 100644
--- a/GetHip/Main.storyboard
+++ b/GetHip/Main.storyboard
@@ -74,8 +74,8 @@
                         <outlet property="signIn" destination="ALE-x0-k9I" id="mOR-kB-ZID"/>
                         <outlet property="signUpButton" destination="lST-pS-LgB" id="Foa-6z-LBJ"/>
                         <outlet property="userEmailField" destination="gFr-9c-756" id="xPA-UK-gem"/>
-                        <segue destination="kZ0-PQ-f7W" kind="show" identifier="LoginToHomeSegue" id="7ie-yW-8jM"/>
-                        <segue destination="6Yk-7p-Ylr" kind="show" identifier="signUpSegue" id="Lte-65-p9s"/>
+                        <segue destination="i3K-xv-zw1" kind="show" identifier="LoginToHomeSegue" id="5pn-ck-WiI"/>
+                        <segue destination="dsv-bM-qgc" kind="show" identifier="signUpSegue" id="gK7-EH-zMe"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="6qe-4m-7Cy" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -164,23 +164,6 @@
             </objects>
             <point key="canvasLocation" x="671" y="1027"/>
         </scene>
-        <!--Navigation Controller-->
-        <scene sceneID="xtu-tQ-Tcf">
-            <objects>
-                <navigationController id="6Yk-7p-Ylr" sceneMemberID="viewController">
-                    <simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina4"/>
-                    <navigationBar key="navigationBar" contentMode="scaleToFill" id="fzT-rL-U19">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
-                        <autoresizingMask key="autoresizingMask"/>
-                    </navigationBar>
-                    <connections>
-                        <segue destination="dsv-bM-qgc" kind="relationship" relationship="rootViewController" id="T0z-62-dtc"/>
-                    </connections>
-                </navigationController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="RJI-Lv-OTf" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="205" y="1365"/>
-        </scene>
         <!--Login View Controller-->
         <scene sceneID="VdH-cE-Gd7">
             <objects>
@@ -322,23 +305,6 @@
             </objects>
             <point key="canvasLocation" x="41" y="-831"/>
         </scene>
-        <!--Navigation Controller-->
-        <scene sceneID="0Ep-TB-6TC">
-            <objects>
-                <navigationController id="kZ0-PQ-f7W" sceneMemberID="viewController">
-                    <simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina4"/>
-                    <navigationBar key="navigationBar" contentMode="scaleToFill" id="hFF-LE-Tsc">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
-                        <autoresizingMask key="autoresizingMask"/>
-                    </navigationBar>
-                    <connections>
-                        <segue destination="i3K-xv-zw1" kind="relationship" relationship="rootViewController" id="Vuv-dQ-1xi"/>
-                    </connections>
-                </navigationController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="tIK-cA-5MW" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="186" y="717"/>
-        </scene>
         <!--View Controller-->
         <scene sceneID="IwM-WG-Tkx">
             <objects>
@@ -1483,7 +1449,7 @@
         <image name="Turntable@3x.png" width="434" height="434"/>
     </resources>
     <inferredMetricsTieBreakers>
-        <segue reference="Xce-i2-SEV"/>
-        <segue reference="dYP-IJ-p2K"/>
+        <segue reference="5pn-ck-WiI"/>
+        <segue reference="5Ml-AJ-rNB"/>
     </inferredMetricsTieBreakers>
 </document>
diff --git a/GetHip/SettingsTableViewController.swift b/GetHip/SettingsTableViewController.swift
index b19bca5..240e428 100644
--- a/GetHip/SettingsTableViewController.swift
+++ b/GetHip/SettingsTableViewController.swift
@@ -18,7 +18,7 @@ class SettingsTableViewController: UIViewController, UITableViewDataSource, UITa
     
     @IBAction func dismissSettingsView(sender: UIBarButtonItem) {
         
-        self.parentViewController?.dismissViewControllerAnimated(true, completion: nil)
+        self.parentViewController?.navigationController?.popViewControllerAnimated(true)
     }
     
     
@@ -48,7 +48,7 @@ class SettingsTableViewController: UIViewController, UITableViewDataSource, UITa
         self.logOutBtn.layer.borderColor = UIColor.blackColor().CGColor
         self.table.dataSource = self
         self.table.delegate = self
-        
+        self.navigationController?.navigationBarHidden = false
         //NSNotificationCenter.defaultCenter().addObserver(self, selector: "refreshTable:", name: "refreshSettingsView", object: nil)
         
         self.table.reloadData()
diff --git a/GetHip/TestInviteFriendsController.swift b/GetHip/TestInviteFriendsController.swift
index b975737..1a89b5f 100644
--- a/GetHip/TestInviteFriendsController.swift
+++ b/GetHip/TestInviteFriendsController.swift
@@ -55,6 +55,8 @@ class TestInviteFriendsController: UIViewController, UITableViewDelegate, UITabl
         super.viewDidLoad()
         self.table.dataSource = self
         self.table.delegate = self
+        self.navigationController?.navigationBarHidden = false
+
         // Uncomment the following line to preserve selection between presentations
         // self.clearsSelectionOnViewWillAppear = false