Leaking Windscreen

Hi all

I have a soggy bottom....Foot well that is..
I have spent a few hrs removing the roof lining of my disco 2. I have found that the sunroof pipes have been repaired but sealed ok.
Poured water here and there and finally found that the water is coming through the top left passenger side windscreen sealant.. Well attempt at sealant I must say.

If it is coming in from here obviously the sealant is shot (poorly fitted) but should I be looking outside at possible problem too?
The other Q is how do you get the roof lining out of the disco without damaging it? I cant drive with it resting on my head lol...

Thanks in advance
Sean

youve gotta undo everything from front to back, doesn't take long really, take sunroofs right out clean up and re fit in low modulus sealant, do roof bars at same time, there is a thread on here, my old 1 i had to do it, this 1 now no sunroofs but screen was leaking, had new 1 fitted on the insurance all great now!