Improved lobby team management

Can we try get this into next release?