Menu Items are disabled correctly now