fixed user list overlapping the bottom panel
Merge remote-tracking branch 'upstream/master'