Making some changes to get the app to work better on Android.