Cleaning app 

:green_heart: 

Cleaning a little bit the view and modules