Minor adjustments in rendering Cells and motion