added pagination, fixed users and sites view