Fix JS demo toolbar and stabilize highlighting