Broken view states

Tidy up top nav
Add a watch to Grunt file to watch scripts further down the chain. I’m
sure there is a better way than this.