Cleanup share view
Polish share view