Collisions updated & GFX

Nextshape needs to be fixed though, currently invisible