Fix ugliness
Fix more ugliness
Delete duplicate js.