Better organized elements for the Update UI

Ticket: #6300