Further tidy up of comments dialog