Improve the main layout