Add type templates & fix glitch when dragging!