Some fixes

Pagination helpers rewritten
Forms annotations fixes