What did you do when your child started climbing out of the crib?

My 18 month old is climbing out of the crib. He sleeps in our bedroom the crib is between the wall and our bed so when he climbs out he falls onto our bed. He used to go to bed with no fuss at all in his crib when he couldn't climb out. The only problem we are having is even though he is super tired he wont go to sleep without a fight. his usual bedtime is 8 and we have been having some late nights. I have tried just putting him back in his crib every time he climbs out which has gone on for over an hour. Laying with him in our bed which he thinks is a game and fights sleeping but eventually he does go to sleep. Any advice you have to make bedtime easier???