Added changes to FileManager and FileViewWidget from adrian's patch