Angie and sleep (or lack thereof)

Lately we've been having some difficulty with Angie sleeping at night.

Ever since Angie was little, she would softly rock herself to sleep in her crib. Basically, she would be sitting up in her crib while rocking until she fell asleep. A few months ago, she started to climb out of her crib during the night, so we purchased a regular size bed.

Since then, we've been experiencing some difficulty at night. Angie has been waking up during the night and has been sitting in the living room rocking in Alfonso's chair. I think waking up in the night is nothing new to her, but since she no longer has her crib to lean against, she now needs to calm herself by rocking in Alfonso's chair.

Not only is this disturbing the household (she often wakes up in the middle of the night and is very vocal- singing and talking, while waking up the household) but she is not sleeping as much at night. Every morning we find her lying in an uncomfortable position in Alfonso's chair. She is often very irritable during the day, and will try to fall asleep in the afternoon. We generally try to not let her sleep during the afternoon (because then she cannot fall asleep at her bedtime), but often we cannot handle her irritation.

I am not sure what to do about this, other than I hope she grows out of this stage. :(