Fill Between Contours in X + Y + Z 2D matrix contour plot

Dear Forum,

I am a rather inexperienced Igor Pro 7 user. I have generated a contour plot by combining a matrix of Z values (2D wave) and two 1D waves of X and Y values. The plot generated is attached. I now would like to fill in between the contour lines to have a "continuous" plot. I tried doing this by using the Graph Package "Fill Between Contours". The contour selected is the 2D Z wave and I choose "Continuous" as the fill option. The result is attached. It seems that the Fill Image generated is shifted to (0,0) with respect to my original data. I suspect this has to do with using the Z matrix, without reference to the actual X and Y values. I have the same issue when I generate a 3D surface from the contour plot: everything is shifted to 0,0. 

How can I fix this to generate a proper plot (contour and 3D)? Is there a better way to generate the contour plot?

Thank you for your help, suggestions and comments.

 

Contour plot generated from 2 x 1D waves (X,Y) and 1 x 2D wave (Z) Addition of Fill Image from 2D wave