Fix dimensions and label placements