Some (admittedly kinda hacky) UI fixes