More pre-style html changes