Add descriptions, move block properties a la didEndDisplaying to model