Improve SubMenu