lots of ui fixes