add new data source and layout changes