SubMenu builder fixed