[#42353089] Refine the view and clean-up some of the fields