Refactored data grid
Fixed datagrid
Moved filters to separate classes, refactored contracts and cleaned up