Corrected main layout