Gift name and modal fix