ref #9338: restructure term menues and adapt handling