Fixes to CQ Fiddle UI