Added simple view switching