Refactor XAML using Expression Blend