Minor UI changes and strings