converting more code to use ui-router
converting more code to use ui-router