Refact MenuItem to add type