Two UI changes