Upgraded to Angular UI Router