That was suprisingly easy
Fix views
Merge branch '33/refactor_game_player'