A few small ui fixes