Small ui fixes

TBR