Changed map to UI conversion