userid implemented, might be hacky
Improved pagination functionality