Reorders parameters in render_cell to match tuple
Minor cleanups