file-manager-fixes

Fixes #943 

Partially Fixes #942, but now there's some javascript errors.