Styling on header and divs for grid
fixed conflicts
Merge branch 'styling'