Got rid of fragment and made buttons.
Merge branch 'master' of https://github.com/zack13532/Fonely