Worked more on the users page