Come back to ui-router, still buggy routes