Updated Menu, and other things...