Be more careful when checking for interactive forms.
Small changes to default layout.