Ds refactor

Refactor the entire Datasource page