Share View fixes