XAML Clean-Up
Custo window adjust for design