Minor improvements
Improve header content area