WPF handle demo toolbar, minor fixes