Move settings to a sub-menu
Add an indicator for menu entries with submenus