Switch to ui.Router