Rearranged things; simplified buttons
Merge branch 'master' of https://github.com/Fortyseven/TalkTime