Fixed a bug with sharing and a small visual bug