Small fixes
Removed infinite scroll and added manual button.