Interaction panel fixes