Added search field, improved scrolling