Hi all
I'm completely stuck and would love some advice like I always get here on Mumsnet (literally saves my sanity lol)
My DS of 6 months old seems lately to keep his naps during the day short (30 to 60 mins.) and takes a long time to fall asleep at night.
The boy has lots of energy and he's often on his playmat and busy with toys which helps. But his naps seem to be very short and his falling and staying asleep at night is now a nightmare with yesterday being the worst night so far. He fell asleep eventually at 23pm while I either had to hold him, feed him or play baby shark to calm him down 
He's rubbing his eyes, yawning a lot and a bit irritated so he gives lots of sleep cues and I put him to bed as soon as I notice them. Have tried and successfully did PU/PD method for a while but all seems gone now.
He also recently discovered he can roll onto his tummy which he does countless of times before he (finally) falls asleep which results in me walking up and down the stairs a dozen times or like yesterday sitting on the landing 
Anyone what can I do, what can I improve? Any tips or anything to help us? I tried to put something next to him so he can't turn but he sees that as "new" toys and I find it dangerous now to put something in his cot bed.
I'm fully fuelled by coffee today but can't keep up with that every day because it causes me to sleep too late and I've got no time to have a little bit of rest in the evening for me to do things in the house or to get into my bed routine 
Thanks 