added gif and cancel