Updated to allow fully modular html.