A lot of fixes for the android app