Additional minor improvements to UI