Bugfix/content form