Add If block.
Simplify/Refactor block drawing code.
Fix block size bugs.