Game popup
Merge refactoring