Update Map and added icons for lock and movement