More formatting
Adding main search form validation