some html refactoring for security preparation.