Big MainActivity cleanup

Seems to work well... but I can't test camera things because ADT