Added angular and refactored (a little bit) to let angular handle UI nav