WPF options started + bug fixed