Added an advanced directive with transclusion and tweaked nested templates