fixed buttons, prettified many things
Merge branch 'master' of https://github.com/BuracayBeach/myfirstrepo into team2_v5.3
Merge pull request #252 from BuracayBeach/team2_v5.3

Team2 v5.3