ticket:1 templates edited to match mockup