Small layout improvement for multi user