Simplify view switching