Add some avatars and fix some layouts