improve layout switcher with no kwarg save_state
improve layout switcher with no kwarg save_state

Southpaw-TACTIC/TACTIC,diegocortassa/TACTIC,Southpaw-TACTIC/TACTIC,diegocortassa/TACTIC,diegocortassa/TACTIC,Southpaw-TACTIC/TACTIC,Southpaw-TACTIC/TACTIC,Southpaw-TACTIC/TACTIC,diegocortassa/TACTIC,Southpaw-TACTIC/TACTIC,diegocortassa/TACTIC,diegocortassa/TACTIC