Added search and css cleanup