Better re-arrangement of blocks