Switched to AngularUI Router