Fixes for menu layout and titles