Minor changes to Blocks Controller and Model