Fix overlapping & move to better GIF lib

Resolves #104