Changes to main layout
Changes to main layout