Bug 1272: some UI updates