Fully implement new graphics on Goal and Level 3