Moved some buttons around for new UI
Merge branch 'master' of https://github.com/jeffreyrack/hodor