Setting null comments to empty string
Adjusted UI slightly