Responsive map, some fixes