Changed to use AngularUI-router