Add some finishing touches to the Wpf controls and classes