Try to fix infinite pagination issues and minor css tweaks