Tiny refactoring
Refactoring the supervisions view.
Refactoring all the views part1.