Improve client layout
Improve client layout