Fixed up the searchform with the correct classes
Added and deleted some classes to help out the new searchform.