Added validation for new buttons