Updated DataTemplate adn ControlTemplate in scripts directory