Now using layouts for Add NEW Datasource and Add Chart