3 Commits (ui-fixes-2025-03)