Layout fixes and new datasources and widgets