Various changes...
Improving header style