Updated CompanyInfo.xaml & .cs files