Cleaning up package
Fixed search button conflict