Layout Corrected