Small layout fixes for the new build script