Minor UI fixes
More minor UI fixes