Fixing some HTML problems