Refactored Android controller completely