More minor UI fixes