GIFs fix

Completed the fixes. Merging into develop