header made smaller by taking padding off flexbox and header
Merge remote-tracking branch 'upstream/develop' into develop