Reworked menu system to avoid excess children and integrate actions