Second preliminary fix

Fixing a lot of graphic issues... Stats remaining