changed ordering of buttons
Merge pull request #545 from AndyScherzinger/dev

changed ordering of buttons