Well done for surviving the first night - that was a toughy, but it got much easier after that for us! My son doesn't cry AT ALL at bedtime now
I use GW and I am consistent with using it every time I go in to resettle my son for naps & NWs
I go in, tell him it's still sleepy time & help him lie back down (just once) and then use my hand through the cot to settle him down by holding his hand or rubbing his back. If he gets back up I just ask him to lie down after that and wait with him until he calms and goes back to sleep. I try and make sure my hand isn't in the cot whilst he actually falls asleep though, so as not to create a prop (but sometimes he does just want to hold it & that's ok with me)