Correction and layout improvements