Some templates fixes
Some more template fixes
Merging layout changes