merged and add new location modal popup templates
fixed location popups
merged