diff --git a/Chat/Chat/Chat.csproj b/Chat/Chat/Chat.csproj
index 85122cdd..8e77e637 100644
--- a/Chat/Chat/Chat.csproj
+++ b/Chat/Chat/Chat.csproj
@@ -129,8 +129,7 @@
   </ItemGroup>
   <ItemGroup>
     <InterfaceDefinition Include="Resources\LaunchScreen.xib" />
-    <InterfaceDefinition Include="MainStoryboard_iPhone.storyboard" />
-    <InterfaceDefinition Include="MainStoryboard_iPad.storyboard" />
+    <InterfaceDefinition Include="MainStoryboard.storyboard" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Info.plist" />
diff --git a/Chat/Chat/Info.plist b/Chat/Chat/Info.plist
index e6686785..e60d6af7 100644
--- a/Chat/Chat/Info.plist
+++ b/Chat/Chat/Info.plist
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
@@ -13,7 +13,7 @@
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>MinimumOSVersion</key>
-	<string>8.0</string>
+	<string>7.0</string>
 	<key>UIDeviceFamily</key>
 	<array>
 		<integer>1</integer>
@@ -22,9 +22,9 @@
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
-	<string>MainStoryboard_iPhone</string>
+	<string>MainStoryboard</string>
 	<key>UIMainStoryboardFile~ipad</key>
-	<string>MainStoryboard_iPad</string>
+	<string>MainStoryboard</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>
@@ -32,17 +32,14 @@
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 	<key>UISupportedInterfaceOrientations~ipad</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 	<key>XSAppIconAssets</key>
-	<string>Resources/Images.xcassets/AppIcons.appiconset</string>
+	<string>Resources/Images.xcassets/AppIcon.appiconset</string>
+	<key>XSLaunchImageAssets</key>
+	<string>Resources/Images.xcassets/LaunchImage.launchimage</string>
 </dict>
 </plist>
diff --git a/Chat/Chat/MainStoryboard_iPhone.storyboard b/Chat/Chat/MainStoryboard.storyboard
similarity index 100%
rename from Chat/Chat/MainStoryboard_iPhone.storyboard
rename to Chat/Chat/MainStoryboard.storyboard
diff --git a/Chat/Chat/MainStoryboard_iPad.storyboard b/Chat/Chat/MainStoryboard_iPad.storyboard
deleted file mode 100644
index c400a561..00000000
--- a/Chat/Chat/MainStoryboard_iPad.storyboard
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6750" systemVersion="14D131" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES" initialViewController="BYZ-38-t0r">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6735"/>
-    </dependencies>
-    <scenes>
-        <!--Chat View Controller-->
-        <scene sceneID="tne-QT-ifu">
-            <objects>
-                <viewController id="BYZ-38-t0r" customClass="ChatViewController" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="PSN-LI-cww"/>
-                        <viewControllerLayoutGuide type="bottom" id="ivN-wh-56p"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
-                        <rect key="frame" x="0.0" y="20" width="768" height="1024"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
-                    </view>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
-            </objects>
-        </scene>
-    </scenes>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar" statusBarStyle="blackOpaque"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination"/>
-    </simulatedMetricsContainer>
-</document>
diff --git a/Chat/README.md b/Chat/README.md
new file mode 100644
index 00000000..d4a2c547
--- /dev/null
+++ b/Chat/README.md
@@ -0,0 +1,20 @@
+Chat
+==============
+
+This project shows one way of implementing a bubble-chat rendering similar to the iPhone Messages application.
+The ChatViewController renders the discussion and resizes the input as needed
+
+Build Requirements
+------------------
+
+Building this sample requires Xcode 5.0 and iOS 7.0 SDK
+
+Target
+------
+This sample runnable on iPhoneSimulator/iPadSimulator iPhone/iPad
+
+Author
+------ 
+Inspired by the [AcaniChat](https://github.com/acani/AcaniChat) and [JSQMessagesViewController](https://github.com/jessesquires/JSQMessagesViewController)
+
+Rustam Zaitov
\ No newline at end of file
diff --git a/Chat/metadata.xml b/Chat/metadata.xml
new file mode 100644
index 00000000..eb410024
--- /dev/null
+++ b/Chat/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<SampleMetadata>
+	<ID>e5ea2b78-f299-11e4-a3fd-a8206629811d</ID>
+	<IsFullApplication>false</IsFullApplication>
+	<Level>Beginning</Level>
+	<Tags>User Interface, Getting Started</Tags>
+	<SupportedPlatforms>iOS</SupportedPlatforms>
+	<Gallery>true</Gallery>
+	<MinimumLicenseRequirement>Starter</MinimumLicenseRequirement>
+</SampleMetadata>