Revert "Many fixes"

This reverts commit 0a727aca5b1326963af474189d4707a8b065b228.

No arrow for edit/sharign
Revert "Revert "Many fixes""

This reverts commit 79c3a65177904266679d91ae26f482e3f99c2a9a.
Merge remote-tracking branch 'origin/sharing' into sharing