Moved a few rules to the Layout section