Help with bedtime PLEASE!?

i Have an 18month old with similar problems. tho i am not prego. when she was smaller she would do wonderfully in her bedroom by herself and go to sleep but here recently for the past 4months she wakes up and wants a drink and i am so tired i just bring her to my bed after giving her a drink. my husband wants it to stop tho i don't mind but it's her feet in his face lol. so I started puting calming music on by her bed and patty her to sleep. it works but sometimes when i think she is aleep and try to leave she starts whinning and i have to do it all over again which can take like and hour all together. so i try not to let her take a nap when she gets home from headstart until it's bedtime and she seems to go to bed alot quicker. GOOD LUCK!!