drastically imporved pagination on small