fix validation of data source input
work on styling and content