Minor improvements to UI