[DD-857] [DD-858] [IMPROVEMENT] Change headers to new style & change Data View