Bug fix: headings and form elements