Add html escaping
Improve profile system