Render refactor (with couple of fixes)

Missing Flx prefix.