latest changes and fixes of map with new admin section