map ui changes
merged