Several markup and styling fixes for structure pattern