Resolved some js conflict issues + scrutinizer update