SubMenu Improvements