More fixes and modularizations. Pagination module needs auto-field generation and row class property.