improve a bit of switch layout