Build
Fix rendering
Save rendering props