refac client layout