PMO-2800: UI improvements