Client fixed and pretty