Some other views refactoring