Adding more controls
Fixing up wpf issues