EXOGTN-1613: Imporve switch layout implementation