Sleeping Update

We are still trying to work on Daniels sleeping habits. He does very well for naps in the daytime. He used to nap regularly at 9am to 10:30 am, and then 1pm to 3pm, but now his schedule is changing a bit, and he sleeps from about 10 to 11:10, then 2:30 to 3:45. I think he might be gearing up to just taking one afternoon nap. That would be great to have just one nap for both of the boys at the same time. Noah sleeps from 1 to 3:30 or 4, so that is the goal. For naps I simply lay him down in bed with his bottle and I don't hear from him until he wakes up.
The nights are a little different. Daniel would love to be held at bedtime until he falls asleep lately, and will cry no matter how tiered he is, hoping that we will come in and hold him. We are trying to have a regular night time routine to help with him sleeping schedule. We brush our teeth, read two books, say family prayer and personal pray, then in their own rooms, the boys each get snuggled or held while we sing them two songs, and then we tuck them in. I think it is helping to have a regular routine for Daniel. He still cries, hoping to get held, but most nights it doesn't last too long.
He also wakes up in the night, hoping to get milk. We used to give it to him, but then he started waking up 2, 3, 4 or more times wanting a bottle. We had to put an end to it, and make him wait until 7 for milk. He is doing better, but still wakes up and cries a little, a couple times a night. I am really hoping that he won't be crying by the time the baby is born. It will make nights easier, as well as making it easier for the boys to share a room when it comes time.