Add counters
Add pagination, update template