refactor
completed menu
updated version