Updated Layout Tables