Minor ui fixes