WIP - Still render issue on scroll