adapt template for better forms support
use correct intendation