Rework html machinations