native ui fixes