Enhanced Header

We enhanced the header