Changes to class names and draft of PropertyPanels