More work on Angular, learned routing, re-orgainzed code for multi-view