Merge Search changes

Work done to get search box working, styling correct on most of the toolbar sites, fixes to javascript, second level menu updates