Fixed some menu items enabled status

At least for now separate menu item functions are not necessary.