Progress on edit and restyling.