Design changes across more templates