Refactored Android app (alpha)