Improved Location editing