Some reformat and refactor
Renaming the central Activity, and refactoring