Removed delegate and cleaned up code
Fixed scrollsToTop