Shift HTML stuff into new module
4 files changed