more and more small ui fixes