Layout corrected