Change swap Chkunit template to non-reference

Possible fix to a problem with unit properties move up button problems