Adding the quick search box and some code cleaning