pagination fixes (app and html)