Upgraded to angular-ui-router