US821 - CASA layout improvements (tabs layout)