Refactor main search form code

I standardized the file names & CSS classes and deleted unused code /
objects