Added more minor fixes, made proper the page and cell display limits