made changes to buttons

Aha, so my comment earlier about re-arranging the buttons wasn't valid, these override the ordering in the javascript. Can we get rid of these and instead have the ordering in the Javascript as they'd appear on the page?