Added custom icons and all-in-one map