Rework of scripts and using SVG/Canvas elements