6th commit

Reorder methods in MainActivity for clarity