Fill out the menu, revert some regressions in ecef921