Correct height on build rows
Improve scope isolation on build rows