[#83704408] Refactor view