More squad and template changes; add show_squad template