xss fix and small css fix