added changes for users page
updated macro paginations