Death status is incorrectly presented/formatted in pedigree editor

If both age and cause of death are known, the label under the pedigree node would be e.g.

[ node ]
38y
[ externalID ]
d. (stroke)

it should be:

[ node ]
d. 38y
(stroke)
[ externalID ]

(e.g. the "d.' symbol should be in a different place, and cause of death should be right below the age label, not separated form it by external ID field)

Also extra space should be added between generations in case cause of death is present (since cause of death label takes an extra space and may overlap the graphic for one of the next-generation nodes)