Fix map and layer item layout