Added support for the layouteditor