Fix: Avoid wrapping
Qual: Removed useless use of js
Fix: Removed html5 warnings