Code cleanup
Fixed search bar scrolling issue