Product modal fixes