Refactor/angular subviews rebased

Angular routing is all over the place now! Time to re-integrate styling!