Updated some views and organized components into classes.
Merge branch 'master' of github.com:canvasforum/Canvas