Formatted MainActivity
Merged MainActivity