cleaning up styles, fixing xss issue