 // Program Globals
 // ------------------------------------------------
 bool      m_bQuit = false;
-char      m_EmptyStr[] = "\0";
-char*     m_pEmptyStr = (char*)&m_EmptyStr;
-char      m_NewCountry[] = "New Country";
-char*     m_pNewCountry = (char*)&m_NewCountry;
-int16_t   m_nNumNewCountry = 0;
-char      m_NewCode[10];
-
-#define COUNTRY_CNT  13
+int16_t   m_nNumNewCountry = 0; // Counter for New Countries
+char      m_acNewCode[6];
+
+#define COUNTRY_CNT  12
 
 char m_CountryCodes[COUNTRY_CNT][4] = {
   "US",

// ------------------------------------------------
bool InitGUI()
{
  gslc_tsElemRef* pElemRef = NULL;

//<InitGUI !Start!>

    switch (pElem->nId) {
//<Button Enums !Start!>
      case E_BTN_ADD:
        sprintf(acTxt,"New Country%d",m_nNumNewCountry+1);
        if (gslc_ElemXListboxInsertItemAt(&m_gui,m_pElemListbox,0,acTxt)) {
          // successfully added new country
          m_nNumNewCountry++;
          gslc_ElemSetTxtStr(&m_gui, m_pElemSel, searchCountryCode(acTxt));
        } else {
          gslc_ElemSetTxtStr(&m_gui, m_pElemSel, "");
          gslc_PopupShow(&m_gui, E_PG_WARNING, true);
        }
        break;
