DatasourcesMenu now using og.common.util.ui.Block fully