Restructure forms
Enable automatic skipping