Client ui fixes