Button Layout Tweaks

Slight button layout tweaks in layer mode