US821 - CASA layout improvements (updated)