Updated search box to show/hide on focus in/out
Minor code cleanup