Map bug fixed and UI updated