Render refactor (with couple of fixes)

Everything should have Flx, or nothing should have Flx. Inconsistency kills me inside.