Refactored some of the block creation, added delete block option