Huge refactoring of AddGameUI and started refactoring EditGameUI