Fixed building alignment issues once and for all (hopefully)