Fix edit document link in document picker
Some fixes
Merge pull request #857 from inthause/documents

Some fixes