Refactoring Dialog
Added player labels