Refactoring all html/