Add IDs back to header/footer for compatibility