Fixed sidebar issues
Escaped some variables