diff --git a/GetHip/FriendsListViewController.swift b/GetHip/FriendsListViewController.swift
index a7e2b34..76373b4 100644
--- a/GetHip/FriendsListViewController.swift
+++ b/GetHip/FriendsListViewController.swift
@@ -67,6 +67,7 @@ class FriendsListViewController: UIViewController, UITableViewDelegate, UITableV
         if( indexPath.row == 0){
             let cell = self.table.dequeueReusableCellWithIdentifier("RequestCell", forIndexPath: indexPath) as? FriendRequestCell
             
+            self.table.rowHeight = cell!.bounds.size.height
             //sets count for current number of request
             cell?.requestNumber.text = String(self.request.count)
             return cell!
@@ -79,6 +80,7 @@ class FriendsListViewController: UIViewController, UITableViewDelegate, UITableV
             
             //sets display name of friend (print for debugging purposes)
             cell!.friendName.text = friend!.displayName
+            self.table.rowHeight = cell!.bounds.size.height
             //println(friend!.displayName)
             
             //sets profile image of current cell
@@ -116,6 +118,20 @@ class FriendsListViewController: UIViewController, UITableViewDelegate, UITableV
         
     }
     
+    /*func tableView(tableView: UITableView, heightForRowAtIndexPath indexPath: NSIndexPath) -> CGFloat {
+        println(indexPath.row)
+        if indexPath.row == 0{
+            let cell = self.table.dequeueReusableCellWithIdentifier("RequestCell", forIndexPath: indexPath) as? FriendRequestCell
+            
+            return cell?.bounds.size.height as CGFloat!
+        }else{
+            let cell = self.table.dequeueReusableCellWithIdentifier("FriendCell", forIndexPath: indexPath) as? FriendsCell
+            
+            return cell?.bounds.size.height as CGFloat!
+
+        }
+    }*/
+    
     override func setEditing(editing: Bool, animated: Bool) {
         super.setEditing(editing, animated: animated)
         self.table.setEditing(editing, animated: true)
diff --git a/GetHip/LoginController.swift b/GetHip/LoginController.swift
index 77fac1b..0e9c612 100644
--- a/GetHip/LoginController.swift
+++ b/GetHip/LoginController.swift
@@ -44,13 +44,17 @@ class LoginController: UIViewController, PFLogInViewControllerDelegate {
         // Do any additional setup after loading the view.
         //check if user already signed in
         if(PFUser.currentUser() != nil){
+            
             presentLoggedInAlert()
+        
         }
         
         self.signIn.layer.borderWidth = 1
         self.signIn.layer.cornerRadius = 5
         self.signIn.layer.borderColor = UIColor.whiteColor().CGColor
-        self.navigationController?.navigationBarHidden = true
+        //self.navigationController?.navigationBarHidden = true
+            
+        
         
     }
 
@@ -60,7 +64,8 @@ class LoginController: UIViewController, PFLogInViewControllerDelegate {
     }
     
     func presentLoggedInAlert() {
-        self.performSegueWithIdentifier("LoginToHomeSegue", sender: self)
+        var story = UIStoryboard(name: "Main", bundle: nil)
+        var homeVC: HomeScreenViewController = story.instantiateViewControllerWithIdentifier("HomeVC") as! HomeScreenViewController!
         
     }    /*
     // MARK: - Navigation
diff --git a/GetHip/Main.storyboard b/GetHip/Main.storyboard
index 01084a8..2962414 100644
--- a/GetHip/Main.storyboard
+++ b/GetHip/Main.storyboard
@@ -353,20 +353,20 @@
         <!--Friends List View Controller-->
         <scene sceneID="f64-9e-nxp">
             <objects>
-                <viewController id="Wv2-hP-rqT" customClass="FriendsListViewController" customModule="GetHip" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController automaticallyAdjustsScrollViewInsets="NO" id="Wv2-hP-rqT" customClass="FriendsListViewController" customModule="GetHip" customModuleProvider="target" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="8ym-uq-Pb7"/>
                         <viewControllerLayoutGuide type="bottom" id="cK5-oC-1To"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="jS0-Hf-zMc">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                        <rect key="frame" x="0.0" y="64" width="320" height="568"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="Bxz-d2-wT5">
                                 <rect key="frame" x="0.0" y="64" width="320" height="504"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <searchBar key="tableHeaderView" contentMode="redraw" id="pFw-ta-NIX">
-                                    <rect key="frame" x="0.0" y="262" width="320" height="44"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                     <textInputTraits key="textInputTraits"/>
                                     <connections>
@@ -484,7 +484,7 @@
         <!--Home Screen View Controller-->
         <scene sceneID="74v-iN-Rpu">
             <objects>
-                <viewController id="i3K-xv-zw1" customClass="HomeScreenViewController" customModule="GetHip" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="HomeVC" id="i3K-xv-zw1" customClass="HomeScreenViewController" customModule="GetHip" customModuleProvider="target" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="TfY-s2-B0B"/>
                         <viewControllerLayoutGuide type="bottom" id="nqn-B0-8f9"/>
@@ -1153,7 +1153,7 @@
         <!--Song Selection View Controller-->
         <scene sceneID="IkJ-pX-wAP">
             <objects>
-                <viewController id="VGZ-6j-3c9" customClass="SongSelectionViewController" customModule="GetHip" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController automaticallyAdjustsScrollViewInsets="NO" id="VGZ-6j-3c9" customClass="SongSelectionViewController" customModule="GetHip" customModuleProvider="target" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="AfP-pS-mzX"/>
                         <viewControllerLayoutGuide type="bottom" id="Zss-AJ-MHl"/>