other refactored menues. Beware of new bugs!