Refactor HTML structure to pass Integration tests