fix circular dependency betwee map and utils
fix partner screen stuff