Added save and next feature to property manager