Submenu repaired and improved