Updated the PropertyPanel, and also the C of O