several ui fixes