(Menu) Some more refactors