Refactor views management

Test all views