GamePage update + cleaning project