Reverted to Non-Separate Form and WPF