Cleanup and minor changes. WPF version broken resize!