Refactored code in AppInterface and CountryVsCountryChart