menu refactoring
error messages fix