diff --git a/Vector/Base.lproj/Main.storyboard b/Vector/Base.lproj/Main.storyboard
index 1037d44b8..755088680 100644
--- a/Vector/Base.lproj/Main.storyboard
+++ b/Vector/Base.lproj/Main.storyboard
@@ -44,7 +44,7 @@
                         <segue destination="KDg-aD-xlK" kind="show" identifier="showRoomSearch" id="hdA-V1-9AF"/>
                         <segue destination="nDS-pp-sWM" kind="show" identifier="showMemberDetails" id="cUw-vU-gJq"/>
                         <segue destination="gkO-rP-nGK" kind="show" identifier="showContactDetails" action="showDetailViewController:sender:" id="f5u-Y1-7nt"/>
-                        <segue destination="5CG-x5-eo5" kind="presentation" identifier="showUnknownDevices" id="HmV-62-pdU"/>
+                        <segue destination="ZZb-IS-a1F" kind="presentation" identifier="showUnknownDevices" id="wUx-4y-ybn"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="94y-cU-qQD" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -113,13 +113,47 @@
             </objects>
             <point key="canvasLocation" x="2558" y="-1299"/>
         </scene>
+        <!--Users Devices View Controller-->
+        <scene sceneID="fKQ-Tq-qUc">
+            <objects>
+                <viewController id="z83-KC-trJ" customClass="UsersDevicesViewController" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="KBN-JV-gSS"/>
+                        <viewControllerLayoutGuide type="bottom" id="lAN-yJ-zNI"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="b5v-sy-iSu">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <subviews>
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="43F-4t-lHi">
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                            </tableView>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <constraints>
+                            <constraint firstAttribute="trailing" secondItem="43F-4t-lHi" secondAttribute="trailing" id="6FJ-ku-UE3"/>
+                            <constraint firstItem="43F-4t-lHi" firstAttribute="bottom" secondItem="lAN-yJ-zNI" secondAttribute="top" id="GK2-7h-FE0"/>
+                            <constraint firstItem="43F-4t-lHi" firstAttribute="leading" secondItem="b5v-sy-iSu" secondAttribute="leading" id="Qda-BV-cf8"/>
+                            <constraint firstItem="43F-4t-lHi" firstAttribute="top" secondItem="b5v-sy-iSu" secondAttribute="top" id="uhO-a4-0iq"/>
+                        </constraints>
+                    </view>
+                    <navigationItem key="navigationItem" id="Wgm-wm-4Qq"/>
+                    <connections>
+                        <outlet property="tableView" destination="43F-4t-lHi" id="ebQ-8p-875"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="UVa-0l-PGg" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="2558" y="180"/>
+        </scene>
         <!--Segmented View Controller-->
         <scene sceneID="NZu-Q0-P0z">
             <objects>
                 <tableViewController id="e7G-NU-7ck" customClass="SegmentedViewController" sceneMemberID="viewController"/>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="fXh-hO-Zgf" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="2558" y="-595"/>
+            <point key="canvasLocation" x="2558" y="-546"/>
         </scene>
         <!--Authentication View Controller-->
         <scene sceneID="FoA-N2-3aF">
@@ -315,38 +349,23 @@
             </objects>
             <point key="canvasLocation" x="3346" y="-3935"/>
         </scene>
-        <!--Users Devices View Controller-->
-        <scene sceneID="RSF-rj-bxv">
-            <objects>
-                <tableViewController id="yAK-cH-GIm" customClass="UsersDevicesViewController" sceneMemberID="viewController">
-                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="68" sectionFooterHeight="28" id="cJ1-UB-ddI">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                    </tableView>
-                    <navigationItem key="navigationItem" id="bz4-QB-4ei"/>
-                </tableViewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="y4A-Q3-hqH" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="2558" y="74"/>
-        </scene>
         <!--Navigation Controller-->
-        <scene sceneID="EdH-bW-mhE">
+        <scene sceneID="Qyz-FA-hw5">
             <objects>
-                <navigationController automaticallyAdjustsScrollViewInsets="NO" id="5CG-x5-eo5" sceneMemberID="viewController">
+                <navigationController automaticallyAdjustsScrollViewInsets="NO" id="ZZb-IS-a1F" sceneMemberID="viewController">
                     <toolbarItems/>
-                    <navigationBar key="navigationBar" contentMode="scaleToFill" id="VxF-jf-H2t">
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" id="MHE-SG-tnL">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <nil name="viewControllers"/>
                     <connections>
-                        <segue destination="yAK-cH-GIm" kind="relationship" relationship="rootViewController" id="2ox-mq-u3b"/>
+                        <segue destination="z83-KC-trJ" kind="relationship" relationship="rootViewController" id="83C-0z-Ld8"/>
                     </connections>
                 </navigationController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="WZ3-dq-2aK" userLabel="First Responder" sceneMemberID="firstResponder"/>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="aTW-5P-KnU" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="1385" y="74"/>
+            <point key="canvasLocation" x="1385" y="180"/>
         </scene>
     </scenes>
     <resources>
@@ -354,8 +373,8 @@
         <image name="settings_icon.png" width="24" height="24"/>
     </resources>
     <inferredMetricsTieBreakers>
+        <segue reference="f5u-Y1-7nt"/>
         <segue reference="agy-3r-khl"/>
         <segue reference="cUw-vU-gJq"/>
-        <segue reference="f5u-Y1-7nt"/>
     </inferredMetricsTieBreakers>
 </document>
diff --git a/Vector/ViewController/UsersDevicesViewController.h b/Vector/ViewController/UsersDevicesViewController.h
index 0d54aee02..22905fc28 100644
--- a/Vector/ViewController/UsersDevicesViewController.h
+++ b/Vector/ViewController/UsersDevicesViewController.h
@@ -18,7 +18,7 @@
 
 #import "DeviceTableViewCell.h"
 
-@interface UsersDevicesViewController : MXKTableViewController <UITableViewDelegate, UITableViewDataSource, DeviceTableViewCellDelegate>
+@interface UsersDevicesViewController : MXKViewController <UITableViewDelegate, UITableViewDataSource, DeviceTableViewCellDelegate>
 
 /**
  Display a map of users/devices.
@@ -27,4 +27,6 @@
  */
 - (void)displayUsersDevices:(MXUsersDevicesMap<MXDeviceInfo*>*)usersDevices andMatrixSession:(MXSession*)mxSession;
 
+@property (weak, nonatomic) IBOutlet UITableView *tableView;
+
 @end
diff --git a/Vector/ViewController/UsersDevicesViewController.m b/Vector/ViewController/UsersDevicesViewController.m
index a09d585f1..b89079a7f 100644
--- a/Vector/ViewController/UsersDevicesViewController.m
+++ b/Vector/ViewController/UsersDevicesViewController.m
@@ -36,6 +36,12 @@
 
 @implementation UsersDevicesViewController
 
+- (void)displayUsersDevices:(MXUsersDevicesMap<MXDeviceInfo*>*)theUsersDevices andMatrixSession:(MXSession*)matrixSession;
+{
+    usersDevices = theUsersDevices;
+    mxSession = matrixSession;
+}
+
 - (void)finalizeInit
 {
     [super finalizeInit];
@@ -91,13 +97,8 @@
     [super viewWillDisappear:animated];
 }
 
-- (void)displayUsersDevices:(MXUsersDevicesMap<MXDeviceInfo*>*)theUsersDevices andMatrixSession:(MXSession*)matrixSession;
-{
-    usersDevices = theUsersDevices;
-    mxSession = matrixSession;
-}
-
 #pragma mark - UITableViewDataSource
+
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
 {
     return usersDevices.userIds.count;
@@ -163,20 +164,20 @@
         [self.view addConstraint:[NSLayoutConstraint constraintWithItem:encryptionInfoView
                                                               attribute:NSLayoutAttributeTop
                                                               relatedBy:NSLayoutRelationEqual
-                                                                 toItem:self.tableView
-                                                              attribute:NSLayoutAttributeTop
+                                                                 toItem:self.topLayoutGuide
+                                                              attribute:NSLayoutAttributeBottom
                                                              multiplier:1.0f
                                                                constant:10.0f]];
 
         [self.view addConstraint:[NSLayoutConstraint constraintWithItem:encryptionInfoView
                                                               attribute:NSLayoutAttributeBottom
                                                               relatedBy:NSLayoutRelationEqual
-                                                                 toItem:self.tableView
-                                                              attribute:NSLayoutAttributeBottom
+                                                                 toItem:self.bottomLayoutGuide
+                                                              attribute:NSLayoutAttributeTop
                                                              multiplier:1.0f
                                                                constant:-10.0f]];
 
-        [self.view addConstraint:[NSLayoutConstraint constraintWithItem:self.tableView
+        [self.view addConstraint:[NSLayoutConstraint constraintWithItem:self.view
                                                               attribute:NSLayoutAttributeLeading
                                                               relatedBy:NSLayoutRelationEqual
                                                                  toItem:encryptionInfoView
@@ -184,7 +185,7 @@
                                                              multiplier:1.0f
                                                                constant:-10.0f]];
 
-        [self.view addConstraint:[NSLayoutConstraint constraintWithItem:self.tableView
+        [self.view addConstraint:[NSLayoutConstraint constraintWithItem:self.view
                                                               attribute:NSLayoutAttributeTrailing
                                                               relatedBy:NSLayoutRelationEqual
                                                                  toItem:encryptionInfoView