Fixing the Z index issue