Still can't get the view to switch properly. Grr...