Fix html escape bug in layouts
Fix test fail on windows