Clean up code and add necessary button.
Merge branch 'master' of https://github.com/jonghough/MOGdroid.git