Fixed Fix for layout switcher -.-