Added editing classes & yellow blocks