Tweaked Share functionality