diff --git a/demo/src/main/java/com/flurgle/camerakit/demo/VideoPreviewActivity.java b/demo/src/main/java/com/flurgle/camerakit/demo/VideoPreviewActivity.java
index 34c9fb8b..17228a3d 100644
--- a/demo/src/main/java/com/flurgle/camerakit/demo/VideoPreviewActivity.java
+++ b/demo/src/main/java/com/flurgle/camerakit/demo/VideoPreviewActivity.java
@@ -7,6 +7,7 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.MediaController;
 import android.widget.TextView;
@@ -44,6 +45,12 @@ public class VideoPreviewActivity extends Activity {
             @Override
             public void onPrepared(MediaPlayer mp) {
                 actualResolution.setText(mp.getVideoWidth() + " x " + mp.getVideoHeight());
+                ViewGroup.LayoutParams lp = videoView.getLayoutParams();
+                float videoWidth = mp.getVideoWidth();
+                float videoHeight = mp.getVideoHeight();
+                float viewWidth = videoView.getWidth();
+                lp.height = (int) (viewWidth * (videoHeight / videoWidth));
+                videoView.setLayoutParams(lp);
             }
         });
         playVideo();
diff --git a/demo/src/main/res/layout/activity_video_preview.xml b/demo/src/main/res/layout/activity_video_preview.xml
index d3ad5a7a..68158f7d 100644
--- a/demo/src/main/res/layout/activity_video_preview.xml
+++ b/demo/src/main/res/layout/activity_video_preview.xml
@@ -1,39 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <VideoView
-        android:id="@+id/video"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
-
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@android:color/white">
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="100dp"
-        android:layout_gravity="bottom"
-        android:gravity="center_vertical"
-        android:background="@android:color/white"
-        android:orientation="horizontal">
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="8dp"
-            android:text="ACTUAL RESOLUTION"
-            android:textColor="@android:color/black"
-            android:textSize="18sp"
-            android:textStyle="bold" />
+        <VideoView
+            android:id="@+id/video"
+            android:layout_width="match_parent"
+            android:layout_height="200dp"/>
 
-        <TextView
-            android:id="@+id/actualResolution"
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="8dp"
-            android:textColor="@android:color/black"
-            android:textSize="14.5sp" />
+            android:orientation="vertical"
+            android:padding="16dp">
 
-    </LinearLayout>
+            <!-- Resolution -->
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp">
+                <View
+                    android:layout_width="2.5dp"
+                    android:layout_height="match_parent"
+                    android:background="@color/colorPrimary" />
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:orientation="vertical">
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="3dp"
+                        android:text="ACTUAL RESOLUTION"
+                        android:textColor="@android:color/black"
+                        android:textSize="18sp"
+                        android:textStyle="bold" />
+                    <TextView
+                        android:id="@+id/actualResolution"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="3dp"
+                        android:textColor="@android:color/black"
+                        android:textSize="14.5sp" />
+                </LinearLayout>
+            </FrameLayout>
+
+        </LinearLayout>
 
-</FrameLayout>
+    </LinearLayout>
+</ScrollView>