diff --git a/.travis.yml b/.travis.yml
index 0b7b450c..62e32797 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,8 @@ dist: xenial
 language: python
 python:
 - '3.6'
+jdk:
+- oraclejdk8
 install:
 - deactivate
 - export PATH=/usr/bin:$PATH
diff --git a/app/src/component/floatingWalletBalance/view.js b/app/src/component/floatingWalletBalance/view.js
index 12f25fe7..f48fb184 100644
--- a/app/src/component/floatingWalletBalance/view.js
+++ b/app/src/component/floatingWalletBalance/view.js
@@ -20,7 +20,7 @@ class FloatingWalletBalance extends React.PureComponent<Props> {
                         onPress={() => navigation && navigation.navigate({ routeName: 'WalletStack' })}>
         {isNaN(balance) && <ActivityIndicator size="small" color={Colors.White} />}
         <Text style={floatingButtonStyle.text}>
-          {(balance || balance === 0) && (formatCredits(balance, 2) + ' LBC')}
+          {(balance || balance === 0) && (formatCredits(parseFloat(balance), 2) + ' LBC')}
         </Text>
       </TouchableOpacity>
     );
diff --git a/app/src/component/walletBalance/view.js b/app/src/component/walletBalance/view.js
index 5ca0db9d..ede0261e 100644
--- a/app/src/component/walletBalance/view.js
+++ b/app/src/component/walletBalance/view.js
@@ -19,7 +19,7 @@ class WalletBalance extends React.PureComponent<Props> {
         <Text style={walletStyle.balanceTitle}>Balance</Text>
         <Text style={walletStyle.balanceCaption}>You currently have</Text>
         <Text style={walletStyle.balance}>
-          {(balance || balance === 0) && (formatCredits(balance, 2) + ' LBC')}
+          {(balance || balance === 0) && (formatCredits(parseFloat(balance), 2) + ' LBC')}
         </Text>
       </View>
     );
diff --git a/app/src/page/rewards/view.js b/app/src/page/rewards/view.js
index 000f0adb..d57ff467 100644
--- a/app/src/page/rewards/view.js
+++ b/app/src/page/rewards/view.js
@@ -142,7 +142,10 @@ class RewardsPage extends React.PureComponent {
 
     return (
       <View style={rewardStyle.container}>
-        <ScrollView style={rewardStyle.scrollContainer} contentContainerStyle={rewardStyle.scrollContentContainer}>
+        <ScrollView
+          keyboardShouldPersistTaps={'handled'}
+          style={rewardStyle.scrollContainer}
+          contentContainerStyle={rewardStyle.scrollContentContainer}>
           {this.renderVerification()}
           {this.renderUnclaimedRewards()}
           {this.renderClaimedRewards()}
diff --git a/app/src/page/wallet/view.js b/app/src/page/wallet/view.js
index 5fcb1607..35462c2e 100644
--- a/app/src/page/wallet/view.js
+++ b/app/src/page/wallet/view.js
@@ -27,7 +27,7 @@ class WalletPage extends React.PureComponent {
     }
 
     return (
-      <ScrollView>
+      <ScrollView keyboardShouldPersistTaps={'handled'}>
         <WalletBalance />
         <WalletAddress />
         <WalletSend />
diff --git a/app/src/styles/firstRun.js b/app/src/styles/firstRun.js
index 562e2268..5938e2e5 100644
--- a/app/src/styles/firstRun.js
+++ b/app/src/styles/firstRun.js
@@ -65,8 +65,9 @@ const firstRunStyle = StyleSheet.create({
   },
   button: {
     alignSelf: 'flex-end',
-    marginLeft: 32,
-    marginRight: 32
+    padding: 20,
+    paddingLeft: 32,
+    paddingRight: 32
   },
   buttonText: {
     fontFamily: 'Metropolis-Regular',
diff --git a/p4a/pythonforandroid/bootstraps/lbry/build/gradle/wrapper/gradle-wrapper.properties b/p4a/pythonforandroid/bootstraps/lbry/build/gradle/wrapper/gradle-wrapper.properties
index ac1799fa..8733ff37 100644
--- a/p4a/pythonforandroid/bootstraps/lbry/build/gradle/wrapper/gradle-wrapper.properties
+++ b/p4a/pythonforandroid/bootstraps/lbry/build/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip