Massive changes

blocks
second page