Adjust headers position

Change-Id: I782464c2e8ccd83abac6239dee94c400c07593d9