new layout all data sources fixed