menu added plus hueg refactor