[#42656039] [#42656109] - Polished views and tested