Rework html for users/index