ui fixes all around