Sleeping thru the night

We still have a long way to go until I get 7 hours of unbroken sleep bliss, but we are getting closer.  Little guy gets to bed every night at 8ish after singing, lotion and story time.  I think he acts all cranky right before bedtime because he likes it so much.  We can be downstairs and he's Mr Fussy Pants but as soon as we get upstairs, he's this-