moved the datagrid colums into xaml, some cleanup