I hope this will be able to solve all your problems and for the current html pages you can open the DCRs and use
1. Right click on VFE fiels --> select clean source
or
1. modifying the content in VFE auto forces a clean source.
This will allow you to solve the problem, I faced this issue on Production server and was able to resolve it.
-Rahul.