Refactored infinite scroll, minor link and style change