Fix: quitting - Add: menu to own class