Improve the menu layout