Refacto ModalView
+ Unit test