added search, minor style changes