layout corrected