Some more work on menu layout