CMenuManager fields

Reopened the same merge request as the previous one got somewhat broken