Copy changes and fix html
Copy changes