improved re-use by moved stuff into shared partial templates.