pagination in tables, generator
merge conflicts fixed