reworked Menu Integration