Minor UI improvements

2 minor UI improvements