Toggling views

Merging into master.