Updated for latest datagrid & latte-macros