Improvements to cleaning UI, and big optimization on reports