Revert "View and Share samples updating"

This reverts commit 2f5c1862d911940bdbb6b918f67cea42ac2edce3.
Revert "Revert "View and Share samples updating""

This reverts commit 06cab59bcc5e6c4a2d04ec5a03e4ecd26e084fd0.