Please help!

So i’m due at the end of october with baby boy 2, and i have 19 month old. we live in ranch style 2 bedroom apartment. It’s not that big but it’s not that small either, until the baby 15 pounds he will be sleeping in a bassinet. I have a few questions hah. Stick with me.

My son refuses to sleep in his big boy bed we will put him in there and he will cry and get up and go to the crib. They are in the same room because the boys will be sharing a room once the new baby gets here and he outgrows his bassinet. So my first question is(for those who already have children), how do i get him to want to sleep in his toddler bed? He liked it the first few nights, it’s paw patrol and he knows he can get up and come into bed with us once he wakes up.

My 2nd question is if i should switch our bedrooms, my fiancé and i have the bigger room. The boys room is smaller and you have to walk through it to get to the bathroom. There is also no door it’s right off my living room. My LO never had any problems, he hardly plays in there even tho most of his toys are in there. And we never have guests over. The crib and his toddler bed for snug in there. I’m just wondering if it would be better to have them in the bigger room and make it more of playroom since it is quite larger. We are never in here unless we are sleeping. Should i switch before mew baby comes? Or wait until he is a little bigger?