Testing shareable buttons
Fixed merge conflicts