Tidy up comment avatars and delete option

@danbartlett that's much nicer!