Changed to ui router, state of disarray