Feature/cleanup angular

Bunch of small things and refactoring to clean up the angular code as much as possible.

This should finish up the angular tasks for this sprint. App looking much better.