Refactor: MenuItem is now split into MenuContainer and MenuFunctionality