Added map icons and formatting