Cleanup code in disp/rgui.c to do with menu entry types