Various fixes
Refactor share component