Correction of some layout problems