A few UI fixes