Refactoring views
Last modifications