Feature 3365: UI tweaks for screens