Fixed new user bug, added pagination