Various design improvements
Improving header