APD-336: new header layout and part of the css
APD-336: new header design
APD-336: post review refinements
Merge branch 'APD-336' into develop