added search, changed layout