Nicer styling

This pads the rooms out to fill their space and DRYs up their
size/positioning.