CMF-23: improved shapes widget