core: improve rendering