Baseline substrate enforcement
Rendering improvement, but still bugged.
More better rendering