initial ui fixes