Tidy up comment avatars and delete option