Better gif-handling