Added layout switcher