Added icons and added map layer