Clean up arrangement of header elements and fix box-shadow seam issue.