added proper user pagination