added infinite scroll, tied up design