adjusted layout switch points