I would suggest keeping the current layout in the demo_users, which is grouping all users together, followed by their userprofiles.