More fixes, hide various menu items that wont be used.