reorder build script to follow page layout
yet more staff fixes