added search engine, layout optimization