Button Layout

Further tweaks to button layout