Added client-side validation on menu items
bug fixes