Fixed issue with file listing, refactored data grid binding a bit