Some Frontend refactoring.
Refactoring of data source page and inputs.