Refactoring of sources tab: more encapsulation of data table