Refactor ResultProperty widget