Revert "New Menu system"

This reverts commit af38e91ce9a239f19a92d63f1185b35278eabf63.