working on views refactor