Adding custom google search and minor changes