Fixing HTML issues