Improved main layout