Fix cropped paper buttons in docs section on small desktop
Fixup conflicts