Refactoring views & simplify