More HTML generation and header file defines