Consumer: UI improvements