many ui fixes