A few ui fixes