layout switch and CSS tweaks