Switch layout fix