changes on popup and new master "Location"