add PropertyPainter
refactor to guard clause
minor ui improvements