diff --git a/Yep/Base.lproj/Main.storyboard b/Yep/Base.lproj/Main.storyboard
index 91feed3c..e66a2dc5 100644
--- a/Yep/Base.lproj/Main.storyboard
+++ b/Yep/Base.lproj/Main.storyboard
@@ -89,7 +89,7 @@
                                             <userDefinedRuntimeAttribute type="string" keyPath="title" value="Choose photo"/>
                                         </userDefinedRuntimeAttributes>
                                     </button>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="HcA-7v-16m" userLabel="Take Photo Button" customClass="MessageTypeButton" customModule="Yep" customModuleProvider="target">
+                                    <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="HcA-7v-16m" userLabel="Take Photo Button" customClass="MessageTypeButton" customModule="Yep" customModuleProvider="target">
                                         <rect key="frame" x="213" y="20" width="174" height="260"/>
                                         <state key="normal">
                                             <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
@@ -323,7 +323,7 @@
                     <connections>
                         <outlet property="contactsTableView" destination="3hF-wd-yhY" id="RfM-bD-4Oe"/>
                         <segue destination="AyC-pt-NR2" kind="show" identifier="showProfile" id="Pxr-1p-x84"/>
-                        <segue destination="XZe-Np-jXB" kind="presentation" identifier="presentAddFriends" id="Qf9-aD-yx1"/>
+                        <segue destination="XZe-Np-jXB" kind="show" identifier="presentAddFriends" id="Qf9-aD-yx1"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="ynX-sO-VM0" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -688,13 +688,7 @@
                             <constraint firstItem="RWL-Ot-i1T" firstAttribute="top" secondItem="Dtr-6Z-xvc" secondAttribute="top" id="xMx-Gt-bzW"/>
                         </constraints>
                     </view>
-                    <navigationItem key="navigationItem" id="7hc-4a-qfO">
-                        <barButtonItem key="rightBarButtonItem" systemItem="done" id="0sg-UK-woz">
-                            <connections>
-                                <action selector="done:" destination="4Ji-K6-SJn" id="JXu-Ik-fzT"/>
-                            </connections>
-                        </barButtonItem>
-                    </navigationItem>
+                    <navigationItem key="navigationItem" id="7hc-4a-qfO"/>
                     <connections>
                         <outlet property="addFriendsTableView" destination="RWL-Ot-i1T" id="znz-Hj-dRa"/>
                         <segue destination="sds-Gw-1Sf" kind="show" identifier="showSearchedUsers" id="kJd-wT-uPb"/>
@@ -1271,7 +1265,7 @@
         <image name="top_shadow" width="375" height="80"/>
     </resources>
     <inferredMetricsTieBreakers>
-        <segue reference="hTj-2y-9h4"/>
+        <segue reference="Pxr-1p-x84"/>
         <segue reference="o3b-2D-AMq"/>
         <segue reference="6No-Lc-7X4"/>
     </inferredMetricsTieBreakers>
diff --git a/Yep/ViewControllers/SearchUsers/SearchUsersViewController.swift b/Yep/ViewControllers/SearchUsers/SearchUsersViewController.swift
index c13e69be..51caeda5 100644
--- a/Yep/ViewControllers/SearchUsers/SearchUsersViewController.swift
+++ b/Yep/ViewControllers/SearchUsers/SearchUsersViewController.swift
@@ -8,7 +8,7 @@
 
 import UIKit
 
-class SearchUsersViewController: UIViewController {
+class SearchUsersViewController: BaseViewController {
 
     @IBOutlet weak var searchedUsersTableView: UITableView!
 
diff --git a/Yep/ViewControllers/SearchedUsers/SearchedUsersViewController.swift b/Yep/ViewControllers/SearchedUsers/SearchedUsersViewController.swift
index afa9bba5..554f3ebe 100644
--- a/Yep/ViewControllers/SearchedUsers/SearchedUsersViewController.swift
+++ b/Yep/ViewControllers/SearchedUsers/SearchedUsersViewController.swift
@@ -8,7 +8,7 @@
 
 import UIKit
 
-class SearchedUsersViewController: UIViewController {
+class SearchedUsersViewController: BaseViewController {
 
     var mobile = "18602354812"