Cleanup and started work on Game viewing.