Client side code for location administration close to done
Forgot a few small changes for location administration