add in functionality to switch views
Merge branch 'master' of github.com:alfredkam/boilerplates