Refactored Core Layout and Block classes