Refactor / Improve File Viewer