Fixes for Android
Full screen
Minor changes