Make stuff play nicer with the VWF, remove some menu items