template integration (2) +design improvments