Updated validation to work with recent submit button changes