Added Icons and map goes to current user location on open