Added fight form and template