backporting some module html
header layout
removed right margin on last item of main-nav.