layouts corrected