Added global search box and other enhancements
Merged with Prabal's change