WPF options continued + refactoring