diff --git a/Yep/Views/Cells/ChatLeftImage/ChatLeftImageCell.xib b/Yep/Views/Cells/ChatLeftImage/ChatLeftImageCell.xib
index a6d55900..d392115f 100644
--- a/Yep/Views/Cells/ChatLeftImage/ChatLeftImageCell.xib
+++ b/Yep/Views/Cells/ChatLeftImage/ChatLeftImageCell.xib
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7528.3" systemVersion="14C1514" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7702" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7518.3"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7701"/>
         <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
     </dependencies>
     <objects>
@@ -14,7 +14,7 @@
                 <rect key="frame" x="0.0" y="0.0" width="298" height="144"/>
                 <subviews>
                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="m2x-3M-xx2" userLabel="Avatar Image View">
-                        <rect key="frame" x="15" y="4" width="40" height="40"/>
+                        <rect key="frame" x="15" y="0.0" width="40" height="40"/>
                         <constraints>
                             <constraint firstAttribute="width" secondItem="m2x-3M-xx2" secondAttribute="height" multiplier="1:1" id="CIb-Am-uCH"/>
                             <constraint firstAttribute="width" constant="40" id="JD9-KR-rN4"/>
@@ -32,7 +32,7 @@
             <constraints>
                 <constraint firstItem="2Dg-WB-LbN" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" id="2kd-sa-eEC"/>
                 <constraint firstItem="2Dg-WB-LbN" firstAttribute="leading" secondItem="m2x-3M-xx2" secondAttribute="trailing" constant="5" id="XGu-Kt-JG7"/>
-                <constraint firstItem="2Dg-WB-LbN" firstAttribute="top" secondItem="m2x-3M-xx2" secondAttribute="top" constant="-4" id="Z28-JS-Ei8"/>
+                <constraint firstItem="2Dg-WB-LbN" firstAttribute="top" secondItem="m2x-3M-xx2" secondAttribute="top" id="Z28-JS-Ei8"/>
                 <constraint firstAttribute="bottom" secondItem="2Dg-WB-LbN" secondAttribute="bottom" id="aYs-Kl-RF4"/>
                 <constraint firstItem="m2x-3M-xx2" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" constant="15" id="jaW-UR-cHe"/>
             </constraints>
diff --git a/Yep/Views/Cells/ChatLeftLocation/ChatLeftLocationCell.xib b/Yep/Views/Cells/ChatLeftLocation/ChatLeftLocationCell.xib
index ce76145b..f91cb283 100644
--- a/Yep/Views/Cells/ChatLeftLocation/ChatLeftLocationCell.xib
+++ b/Yep/Views/Cells/ChatLeftLocation/ChatLeftLocationCell.xib
@@ -14,7 +14,7 @@
                 <rect key="frame" x="0.0" y="0.0" width="354" height="127"/>
                 <subviews>
                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="gG1-9X-ttU" userLabel="Avatar Image View">
-                        <rect key="frame" x="15" y="4" width="40" height="40"/>
+                        <rect key="frame" x="15" y="0.0" width="40" height="40"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="40" id="ZVq-SI-KxM"/>
                             <constraint firstAttribute="width" secondItem="gG1-9X-ttU" secondAttribute="height" multiplier="1:1" id="x8y-Jj-T5A"/>
@@ -34,7 +34,7 @@
                 <constraint firstAttribute="bottom" secondItem="J0W-x9-pAW" secondAttribute="bottom" id="GZA-vw-5eI"/>
                 <constraint firstItem="J0W-x9-pAW" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" id="cyp-v5-Lhu"/>
                 <constraint firstItem="J0W-x9-pAW" firstAttribute="leading" secondItem="gG1-9X-ttU" secondAttribute="trailing" constant="5" id="lGc-LF-Gz8"/>
-                <constraint firstItem="gG1-9X-ttU" firstAttribute="top" secondItem="J0W-x9-pAW" secondAttribute="top" constant="4" id="r7C-9i-vbV"/>
+                <constraint firstItem="gG1-9X-ttU" firstAttribute="top" secondItem="J0W-x9-pAW" secondAttribute="top" id="r7C-9i-vbV"/>
             </constraints>
             <size key="customSize" width="354" height="127"/>
             <connections>
diff --git a/Yep/Views/Cells/ChatLeftVideo/ChatLeftVideoCell.xib b/Yep/Views/Cells/ChatLeftVideo/ChatLeftVideoCell.xib
index 6ed44400..c7296294 100644
--- a/Yep/Views/Cells/ChatLeftVideo/ChatLeftVideoCell.xib
+++ b/Yep/Views/Cells/ChatLeftVideo/ChatLeftVideoCell.xib
@@ -14,7 +14,7 @@
                 <rect key="frame" x="0.0" y="0.0" width="252" height="121"/>
                 <subviews>
                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="NaY-sz-OCL" userLabel="Avatar Image View">
-                        <rect key="frame" x="15" y="4" width="40" height="40"/>
+                        <rect key="frame" x="15" y="0.0" width="40" height="40"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="40" id="Hgr-UG-6Vl"/>
                             <constraint firstAttribute="width" secondItem="NaY-sz-OCL" secondAttribute="height" multiplier="1:1" id="zbU-UC-mfu"/>
@@ -36,7 +36,7 @@
                 <constraint firstAttribute="bottom" secondItem="dJV-3p-NM6" secondAttribute="bottom" id="9st-fe-RF7"/>
                 <constraint firstItem="dJV-3p-NM6" firstAttribute="leading" secondItem="NaY-sz-OCL" secondAttribute="trailing" constant="5" id="BSL-oi-b0w"/>
                 <constraint firstItem="dJV-3p-NM6" firstAttribute="centerX" secondItem="kj2-PU-9Ld" secondAttribute="centerX" id="Kim-ke-x6p"/>
-                <constraint firstItem="dJV-3p-NM6" firstAttribute="top" secondItem="NaY-sz-OCL" secondAttribute="top" constant="-4" id="Ly2-sg-PTj"/>
+                <constraint firstItem="dJV-3p-NM6" firstAttribute="top" secondItem="NaY-sz-OCL" secondAttribute="top" id="Ly2-sg-PTj"/>
                 <constraint firstItem="NaY-sz-OCL" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" constant="15" id="NOl-Za-dpz"/>
                 <constraint firstItem="dJV-3p-NM6" firstAttribute="centerY" secondItem="kj2-PU-9Ld" secondAttribute="centerY" id="wjC-hS-DLv"/>
                 <constraint firstItem="dJV-3p-NM6" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" id="xR1-Mb-S6q"/>
diff --git a/Yep/Views/Cells/ChatRightImage/ChatRightImageCell.xib b/Yep/Views/Cells/ChatRightImage/ChatRightImageCell.xib
index 9d550958..023fc8e2 100644
--- a/Yep/Views/Cells/ChatRightImage/ChatRightImageCell.xib
+++ b/Yep/Views/Cells/ChatRightImage/ChatRightImageCell.xib
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7528.3" systemVersion="14C1514" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7702" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7518.3"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7701"/>
         <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
     </dependencies>
     <objects>
@@ -14,7 +14,7 @@
                 <rect key="frame" x="0.0" y="0.0" width="261" height="121"/>
                 <subviews>
                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="UrC-7s-78h" userLabel="Avatar Image View">
-                        <rect key="frame" x="206" y="4" width="40" height="40"/>
+                        <rect key="frame" x="206" y="0.0" width="40" height="40"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="40" id="0bV-A4-3ae"/>
                             <constraint firstAttribute="width" secondItem="UrC-7s-78h" secondAttribute="height" multiplier="1:1" id="tlL-dS-84G"/>
@@ -34,7 +34,7 @@
                 <constraint firstAttribute="bottom" secondItem="eM3-aJ-C2A" secondAttribute="bottom" id="RcA-3T-IlR"/>
                 <constraint firstItem="eM3-aJ-C2A" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" id="S6r-js-4q3"/>
                 <constraint firstAttribute="trailing" secondItem="UrC-7s-78h" secondAttribute="trailing" constant="15" id="Vbg-DY-59R"/>
-                <constraint firstItem="UrC-7s-78h" firstAttribute="top" secondItem="eM3-aJ-C2A" secondAttribute="top" constant="4" id="umJ-mI-y9g"/>
+                <constraint firstItem="UrC-7s-78h" firstAttribute="top" secondItem="eM3-aJ-C2A" secondAttribute="top" id="umJ-mI-y9g"/>
             </constraints>
             <size key="customSize" width="261" height="121"/>
             <connections>
diff --git a/Yep/Views/Cells/ChatRightLocation/ChatRightLocationCell.xib b/Yep/Views/Cells/ChatRightLocation/ChatRightLocationCell.xib
index b8665356..cf2af5f6 100644
--- a/Yep/Views/Cells/ChatRightLocation/ChatRightLocationCell.xib
+++ b/Yep/Views/Cells/ChatRightLocation/ChatRightLocationCell.xib
@@ -14,14 +14,14 @@
                 <rect key="frame" x="0.0" y="0.0" width="284" height="118"/>
                 <subviews>
                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="SGV-zQ-j8s" userLabel="Avatar Image View">
-                        <rect key="frame" x="229" y="4" width="40" height="40"/>
+                        <rect key="frame" x="229" y="0.0" width="40" height="40"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="40" id="jSz-gK-Ilt"/>
                             <constraint firstAttribute="width" secondItem="SGV-zQ-j8s" secondAttribute="height" multiplier="1:1" id="pNz-xQ-qpd"/>
                         </constraints>
                     </imageView>
                     <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="ivW-u4-fKZ" userLabel="Map Image View">
-                        <rect key="frame" x="27" y="0.0" width="192" height="118"/>
+                        <rect key="frame" x="32" y="0.0" width="192" height="118"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="192" id="7Ua-Pv-tfQ"/>
                         </constraints>
@@ -31,9 +31,9 @@
             </view>
             <constraints>
                 <constraint firstItem="ivW-u4-fKZ" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" id="1vJ-KG-oOM"/>
-                <constraint firstItem="SGV-zQ-j8s" firstAttribute="leading" secondItem="ivW-u4-fKZ" secondAttribute="trailing" constant="10" id="Dab-AU-NnN"/>
+                <constraint firstItem="SGV-zQ-j8s" firstAttribute="leading" secondItem="ivW-u4-fKZ" secondAttribute="trailing" constant="5" id="Dab-AU-NnN"/>
                 <constraint firstAttribute="bottom" secondItem="ivW-u4-fKZ" secondAttribute="bottom" id="PVp-nm-opV"/>
-                <constraint firstItem="SGV-zQ-j8s" firstAttribute="top" secondItem="ivW-u4-fKZ" secondAttribute="top" constant="4" id="QsZ-U0-BoH"/>
+                <constraint firstItem="SGV-zQ-j8s" firstAttribute="top" secondItem="ivW-u4-fKZ" secondAttribute="top" id="QsZ-U0-BoH"/>
                 <constraint firstAttribute="trailing" secondItem="SGV-zQ-j8s" secondAttribute="trailing" constant="15" id="jsX-hK-WmT"/>
             </constraints>
             <size key="customSize" width="284" height="118"/>
diff --git a/Yep/Views/Cells/ChatRightVideo/ChatRightVideoCell.xib b/Yep/Views/Cells/ChatRightVideo/ChatRightVideoCell.xib
index 4adadabc..156525b8 100644
--- a/Yep/Views/Cells/ChatRightVideo/ChatRightVideoCell.xib
+++ b/Yep/Views/Cells/ChatRightVideo/ChatRightVideoCell.xib
@@ -14,20 +14,20 @@
                 <rect key="frame" x="0.0" y="0.0" width="208" height="115"/>
                 <subviews>
                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="cv4-jk-ysG" userLabel="Avatar Image View">
-                        <rect key="frame" x="153" y="4" width="40" height="40"/>
+                        <rect key="frame" x="153" y="0.0" width="40" height="40"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="40" id="Vwc-JE-HbI"/>
                             <constraint firstAttribute="width" secondItem="cv4-jk-ysG" secondAttribute="height" multiplier="1:1" id="cPJ-aC-FeD"/>
                         </constraints>
                     </imageView>
                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Usu-mV-m39" userLabel="Thumbnail Image View">
-                        <rect key="frame" x="17" y="0.0" width="126" height="115"/>
+                        <rect key="frame" x="22" y="0.0" width="126" height="115"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="126" id="nix-mc-fis"/>
                         </constraints>
                     </imageView>
                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_playvideo" translatesAutoresizingMaskIntoConstraints="NO" id="4Zc-y0-R7I" userLabel="Play Image View">
-                        <rect key="frame" x="65" y="43" width="30" height="30"/>
+                        <rect key="frame" x="70" y="43" width="30" height="30"/>
                     </imageView>
                 </subviews>
                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
@@ -36,9 +36,9 @@
                 <constraint firstItem="Usu-mV-m39" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" id="8ku-OC-fVU"/>
                 <constraint firstAttribute="trailing" secondItem="cv4-jk-ysG" secondAttribute="trailing" constant="15" id="9W0-oW-HP0"/>
                 <constraint firstAttribute="bottom" secondItem="Usu-mV-m39" secondAttribute="bottom" id="V8A-BH-zoE"/>
-                <constraint firstItem="cv4-jk-ysG" firstAttribute="top" secondItem="Usu-mV-m39" secondAttribute="top" constant="4" id="Wni-Je-PVy"/>
+                <constraint firstItem="cv4-jk-ysG" firstAttribute="top" secondItem="Usu-mV-m39" secondAttribute="top" id="Wni-Je-PVy"/>
                 <constraint firstItem="4Zc-y0-R7I" firstAttribute="centerX" secondItem="Usu-mV-m39" secondAttribute="centerX" id="YuD-W1-VF7"/>
-                <constraint firstItem="cv4-jk-ysG" firstAttribute="leading" secondItem="Usu-mV-m39" secondAttribute="trailing" constant="10" id="kHP-gM-bdJ"/>
+                <constraint firstItem="cv4-jk-ysG" firstAttribute="leading" secondItem="Usu-mV-m39" secondAttribute="trailing" constant="5" id="kHP-gM-bdJ"/>
                 <constraint firstItem="4Zc-y0-R7I" firstAttribute="centerY" secondItem="Usu-mV-m39" secondAttribute="centerY" id="mR7-Ve-yWj"/>
             </constraints>
             <size key="customSize" width="208" height="115"/>