Changed routing to ui-router