New WPF Layout

Scrambled WPF Layout
commit

commit