Changes to display of service user

Baby and pregnancy info now shown correctly.
Gestation display fixed with some API changes