New design of avatars - fixes #49 - fixes #99