further ui fixes