updated menu's
refactor names