Re-order buttons
Merge pull request #30 from infoburp/master

Re-order buttons