US821 - CASA layout improvements (table layout)