Added search, fixed issue with scrolling.