Menu improvements, second round of testing!