Users and Locations UI working
tough merge from old remote git version. Should be working now