Added functionality to toggle canvas views
Merge branch 'master' of github.com:entaria/aria