Re-order room/building load order - hopefully fixing something?