few ui fixes