map and UI modified