Updated menu layout