Fixed some bugs

Still need to fix Refresh Overview after sharing etc.