Moved the buttons around
Merged with master