checkpoint: extract property  widget
checkpoint: some cleanups