Edit header
Edit header styles
Fix conflicts merge