DrawWidget architecture changed