Huge refactoring of EditGameUI + small changes