Fixed and simplified android app