Started update of the router to use ui-router