More tidying of main nav.
Added mostly complete search capabilities to the header nav