tidy up
Pull group-tag back out of group, as it's better off encrypted.
improve message display