updated mostly everything to use ui router