Switch to use of spinner rather than gif