Added tags and tidied up.

Added helper method for creating view models, removed unused class.
Tidied up controllers a bit.