Checked and tightened up possible XSS Issues