Fix map and header position