WSOTWO-87: Redesigned diagram element widget