refined header/footer
Fix conflicts
Fix more conflicts