fixed main activity bugs
Merge branch 'master' of https://github.com/aluong91/cse190