Added points on map, changed layout