add: improve state renderer