Refactoring of page markup.