Layouts are corrected