*8710* fix discrepancy in galley tab, move templates