Bunch of ui fixes