Merged Niels' changes to the game viewer