Fix margin around avatar, clean up whitespace