Lay client out a bit better