Updated main layout