Update form markup

Cleaned up search form markup