Ok this time I really fixed it.

But it still needs a little more work