UI refactor, switch mode