problems with bulb replacement on DRL

Hey there, I'm having a problem with trying to replace the passenger side DRL bulb. I had to pull out the fuel filter canister to make some room. I was able to get to the bulb out, but the wire frame that keeps the assembly in place has popped out. The top part of the wire frame seems to go into 2 inserts on the top. I have been trying to get that metal clip back in and it has been a problem. I'm wondering if there is another way to get this clip back in so that I can fasten the light assembly back in. Any thoughts would be helpful. Is it possible to remove the whole light assembly to work on it easier?
Sony,

So I was able to get the wire frame back into the right position. It was such a pain to get that back in. Just took some patience.

spfrancis said:

So I was able to get the wire frame back into the right position. It was such a pain to get that back in. Just took some patience.

Click to expand...

The little peanut bulbs are a joy, as well.