updated users index page
merged