Fixed import of user locations, updated map formatting