first cut of ui fixes