Update button variants to align with Pajamas conventions
and clean up the layout and behavior of the avatar section.

Changelog: added