Added form parts for remaining block types