Add translation and improve rendering