Hi Sabrina,
Our bedtime and nap routines are pretty similar. For bedtime, DS chills in crib with a toy for a few minutes while I put his PJs and sleep sack out, and run his bath. He then has his bath and then I diaper him, give him a short massage with baby lotion, put his PJs on, and then his sleep sack. We have soothing music playing in the background during this whole time. Then once he's in his sleep sack, we sit in the chair and we read books to him. Oh we also dim the lights pretty low once we go to the chair. Then DH leaves the room (if he's home to begin with), I hold him and rock him a bit and sing a lullaby and then put him down in his crib with his lovie (which we just started with and he can take it or leave it lol). Naptime looks the same minus the bath and PJs. I still put him in his sleep sack though. We don't do as many stories at naptime.
Up until a few months ago, we always ran white noise in his room. We stopped because we also run a humidifier in his room and it has a dull hum, so it achieves the same purpose. However, I'm not sure it even matters because the humidifier goes on and off and night.
One thing I will tell you that might help -- if you are already doing stories or begin to, I found that with my DS it helps to read as many as it takes (within reason) until he really starts to look sleepy and relaxed. Usually if he yawns or rubs his eyes, we finish the story, sing, and put him down. This wasn't an issue until DS reached about 9 months or maybe a little earlier, but I found that it makes a difference. Sometimes he will squirm and seem to not get tired no matter how many stories and then I eventually call it quits.
Hope this helps!