Various improvements to renderBuildRow