Upgraded to ui-router