Android main activity refactored