Confirmation related adjustments + first tooltip fixes