On demand render program switch
Fixed TextField caret and code beautifications