UI
tMerge branch 'master' of https://github.com/yhmahw/android

* 'master' of https://github.com/yhmahw/android:
  Added buttons and functionality to the buttons as a way to replace swipes right now