fixing names and menu