(Menu) Refactor more menu code