Reorder the styling a bit, enabling avatars for now