Refactor blocks
Refactor views