jquery canvas, css grid layouts
fixed merge conflicts added canvas modal