Feature 3259: UX Tweak