US821 - CASA layout improvements