Fixed submenu bugs