Fixes to the button layout

Mostly in vertical and deskbar mode.