Only show comment fields if required (resolves #95)
Separate diagnosis comment fields (resolves #98)