FileViewer enhancements