Replaced span where needed
Replaced charset meta
Added some metadata