1. make exit return from menu instead of call exit function
2. make menu display more human friendly
update to latest