misc html refactoroing