Animation + improved gesture