Merge "Adjustments to the edit views."