diff --git a/mobile/build.gradle b/mobile/build.gradle
index 12286b09e..377a64f9f 100644
--- a/mobile/build.gradle
+++ b/mobile/build.gradle
@@ -12,7 +12,7 @@ android {
         applicationId "com.android2.calculator3"
         minSdkVersion 14
         targetSdkVersion 22
-        versionCode 73
+        versionCode 74
         versionName "5.0-beta-10"
     }
     buildTypes {
diff --git a/mobile/src/main/AndroidManifest.xml b/mobile/src/main/AndroidManifest.xml
index 5032a3c65..fabb44ac4 100644
--- a/mobile/src/main/AndroidManifest.xml
+++ b/mobile/src/main/AndroidManifest.xml
@@ -3,12 +3,12 @@
     package="com.android2.calculator3"
     android:installLocation="auto">
 
+    <!-- For floating calculator -->
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <uses-permission android:name="android.permission.VIBRATE" />
 
     <uses-sdk android:minSdkVersion="14"
-        android:targetSdkVersion="22"
-        android:maxSdkVersion="22" />
+        android:targetSdkVersion="22" />
 
     <application
         android:allowBackup="true"
diff --git a/mobile/src/main/res/layout-land/activity_calculator.xml b/mobile/src/main/res/layout-land/activity_calculator.xml
index 9deb316a2..31178c70e 100644
--- a/mobile/src/main/res/layout-land/activity_calculator.xml
+++ b/mobile/src/main/res/layout-land/activity_calculator.xml
@@ -30,7 +30,7 @@
         <include layout="@layout/pad_numeric" />
         <include layout="@layout/pad_operator_two_col" />
 
-        <FrameLayout
+        <io.codetail.widget.RevealFrameLayout
             style="@style/PadLayoutStyle.Card">
 
             <FrameLayout
@@ -65,7 +65,7 @@
                 support:borderWidth="0dp"
                 android:layout_gravity="bottom|right" />
 
-        </FrameLayout>
+        </io.codetail.widget.RevealFrameLayout>
 
     </LinearLayout>
 
diff --git a/mobile/src/main/res/layout-sw600dp-port/activity_calculator.xml b/mobile/src/main/res/layout-sw600dp-port/activity_calculator.xml
index f1641e9d2..2d3a7b0ff 100644
--- a/mobile/src/main/res/layout-sw600dp-port/activity_calculator.xml
+++ b/mobile/src/main/res/layout-sw600dp-port/activity_calculator.xml
@@ -21,7 +21,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <FrameLayout
+    <io.codetail.widget.RevealFrameLayout
         android:id="@+id/topPanel"
         android:layout_width="match_parent"
         android:layout_height="200dp"
@@ -59,7 +59,7 @@
             support:borderWidth="0dp"
             android:layout_gravity="bottom|right" />
 
-    </FrameLayout>
+    </io.codetail.widget.RevealFrameLayout>
 
     <LinearLayout
         android:layout_below="@id/topPanel"