Adapt layout in user/group modules, refs #5451