Sleeping Wiggle Worm

Brandon seems to move around a whole bunch while he sleeps.  He even ROLLED OVER for the first time from his back to his stomach 2 nights ago. I just happened to be looking at the monitor and BAM, he just flipped over (then he was stuck next to the crib side and I had to go in and turn him back over and move him back to the middle of the crib).  I would like for him to not move around so much becuase sometimes his little arms and legs end up in between the crib slats and then he can't figure out how to get them back in.  We don't use a bumper becuase I don't want him to get his face stuck up against it so that it out.  He also hates being swaddled, always has, so that isn't an option. Did anyone's kid's move around much while they slept?  Did they grow out of this or was it just something you have to deal with?  

This is how he starts the night.  Closer to the side of the crib that isn't against the wall.

This is what I woke up to at 2:30am.  His head against the rails (his arms were sticking out the top also but I pulled them in before taking the picture).  Not a happy camper here :(