Somemore wpf tidied up
Some wpf tidied up