[#866923] Improved UI and UX.