pagination improved
added some restrictions for users