Fixed rendering issues [skip ci]