Enhance datagrid && manageBlock views