improve state rendering