switch layout + tweaks