Fixed some bugs

Still need to fix Refresh Overview after sharing etc.
Merge pull request #75 from broggi/master

Fixed some bugs