Fix client layout.
Fix message layout.