*8710* fix discrepancy in galley tab, move templates
Merge pull request #238 from jnugent/master

*8710* fix discrepancy in galley tab, move templates