adding in block.rb and layout modifications from odd commit