Updated Layout Corrections