Refactored css and changed map