Fixed search and did some cssing