Merge pull request #1336 from rossriley/file-browse-improvements

File browse improvements