Refactor, more View classes, check View types and more