Button layout tweaks