Layout improvement for multiple users

Refs #1563