Fix the Layout Tables