refactor(flow): split render.rs and other minor changes (#3750)

refactor(flow): split render.rs and other minor changes (#3750) #1690