Wider canvas, update js from master