Revert "use fixed list for submenu"

This reverts commit 25013641d5ed39f963041887923ac6dac91f2f5d.