Vishal, Abhi #749 minor template fixes