Updated FsXaml and corrected build settings

Also cleaned up ViewModel - one "copy" is now in ViewModels2 (unchanged)