Re-added valid/invalid classes
Testing with drill-down menu