WPF GUI improvement