switch order of buttons in bar
fixed margins and padding for admin