Updated Menu, and more