Some XAML updates
Introduce ShowMap command