Partial refactoring of BlockView and BlockComponentView