FileBrowser Paging and some refactoring