ContentBlock refactoring
Fixed merge issues