Thanks everyone!

I've never darkened the room for naps, he sleeps with the light streaming in during the day, but bedtime is a different story for some reason! He also wakes as soon as there's a hint of sunlight in the morning, so about 5am. I don't really want to use a blackout blind, but I'm not sure if I have much choice! Anyone else in the same boat? Will moving his routine by a few minutes each day solve this problem?