Updated xaml with Beto's changes