Committed two lines from John to help fix the menus a bit.