More work on menu
Adding some thought into it