diff --git a/EAPMethods/EAPTTLSUI/StdAfx.h b/EAPMethods/EAPTTLSUI/StdAfx.h
index fae4a76..6c1e78d 100644
Binary files a/EAPMethods/EAPTTLSUI/StdAfx.h and b/EAPMethods/EAPTTLSUI/StdAfx.h differ
diff --git a/EAPMethods/include/TLS_UI.h b/EAPMethods/include/TLS_UI.h
index e1dbd7e..4f9951d 100644
Binary files a/EAPMethods/include/TLS_UI.h and b/EAPMethods/include/TLS_UI.h differ
diff --git a/EAPMethods/res/wxTLS_UI.cpp b/EAPMethods/res/wxTLS_UI.cpp
index 6749e7b..e4aeb5e 100644
--- a/EAPMethods/res/wxTLS_UI.cpp
+++ b/EAPMethods/res/wxTLS_UI.cpp
@@ -55,6 +55,7 @@ wxEAPTLSConfigPanelBase::wxEAPTLSConfigPanelBase( wxWindow* parent, wxWindowID i
 	sb_root_ca_btn->Add( m_root_ca_add_file, 0, wxRIGHT|wxLEFT, 5 );
 	
 	m_root_ca_remove = new wxButton( sb_server_trust->GetStaticBox(), wxID_ANY, _("&Remove CA"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_root_ca_remove->Enable( false );
 	m_root_ca_remove->SetToolTip( _("Removes selected certificate authorities from the list") );
 	
 	sb_root_ca_btn->Add( m_root_ca_remove, 0, wxLEFT, 5 );
@@ -95,7 +96,9 @@ wxEAPTLSConfigPanelBase::wxEAPTLSConfigPanelBase( wxWindow* parent, wxWindowID i
 	this->Layout();
 	
 	// Connect Events
+	m_root_ca->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( wxEAPTLSConfigPanelBase::OnRootCA ), NULL, this );
 	m_root_ca->Connect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( wxEAPTLSConfigPanelBase::OnRootCADClick ), NULL, this );
+	m_root_ca_add_store->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSConfigPanelBase::OnRootCAAddStore ), NULL, this );
 	m_root_ca_add_file->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSConfigPanelBase::OnRootCAAddFile ), NULL, this );
 	m_root_ca_remove->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSConfigPanelBase::OnRootCARemove ), NULL, this );
 }
@@ -103,7 +106,9 @@ wxEAPTLSConfigPanelBase::wxEAPTLSConfigPanelBase( wxWindow* parent, wxWindowID i
 wxEAPTLSConfigPanelBase::~wxEAPTLSConfigPanelBase()
 {
 	// Disconnect Events
+	m_root_ca->Disconnect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( wxEAPTLSConfigPanelBase::OnRootCA ), NULL, this );
 	m_root_ca->Disconnect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( wxEAPTLSConfigPanelBase::OnRootCADClick ), NULL, this );
+	m_root_ca_add_store->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSConfigPanelBase::OnRootCAAddStore ), NULL, this );
 	m_root_ca_add_file->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSConfigPanelBase::OnRootCAAddFile ), NULL, this );
 	m_root_ca_remove->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSConfigPanelBase::OnRootCARemove ), NULL, this );
 	
diff --git a/EAPMethods/res/wxTLS_UI.fbp b/EAPMethods/res/wxTLS_UI.fbp
index ad75595..62c1635 100644
--- a/EAPMethods/res/wxTLS_UI.fbp
+++ b/EAPMethods/res/wxTLS_UI.fbp
@@ -431,7 +431,7 @@
                                                 <event name="OnLeftDClick"></event>
                                                 <event name="OnLeftDown"></event>
                                                 <event name="OnLeftUp"></event>
-                                                <event name="OnListBox"></event>
+                                                <event name="OnListBox">OnRootCA</event>
                                                 <event name="OnListBoxDClick">OnRootCADClick</event>
                                                 <event name="OnMiddleDClick"></event>
                                                 <event name="OnMiddleDown"></event>
@@ -519,7 +519,7 @@
                                                         <property name="window_extra_style"></property>
                                                         <property name="window_name"></property>
                                                         <property name="window_style"></property>
-                                                        <event name="OnButtonClick"></event>
+                                                        <event name="OnButtonClick">OnRootCAAddStore</event>
                                                         <event name="OnChar"></event>
                                                         <event name="OnEnterWindow"></event>
                                                         <event name="OnEraseBackground"></event>
@@ -659,7 +659,7 @@
                                                         <property name="dock">Dock</property>
                                                         <property name="dock_fixed">0</property>
                                                         <property name="docking">Left</property>
-                                                        <property name="enabled">1</property>
+                                                        <property name="enabled">0</property>
                                                         <property name="fg"></property>
                                                         <property name="floatable">1</property>
                                                         <property name="font"></property>
diff --git a/EAPMethods/res/wxTLS_UI.h b/EAPMethods/res/wxTLS_UI.h
index 2e57cc2..da2ed89 100644
--- a/EAPMethods/res/wxTLS_UI.h
+++ b/EAPMethods/res/wxTLS_UI.h
@@ -50,7 +50,9 @@ class wxEAPTLSConfigPanelBase : public wxPanel
 		wxStaticText* m_server_names_note;
 		
 		// Virtual event handlers, overide them in your derived class
+		virtual void OnRootCA( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnRootCADClick( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnRootCAAddStore( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnRootCAAddFile( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnRootCARemove( wxCommandEvent& event ) { event.Skip(); }
 		
diff --git a/EAPMethods/src/TLS_UI.cpp b/EAPMethods/src/TLS_UI.cpp
index e5908fb..6f12599 100644
Binary files a/EAPMethods/src/TLS_UI.cpp and b/EAPMethods/src/TLS_UI.cpp differ
diff --git a/lib/WinStd b/lib/WinStd
index 8aca7f8..645d053 160000
--- a/lib/WinStd
+++ b/lib/WinStd
@@ -1 +1 @@
-Subproject commit 8aca7f8214179b98055123b5f2b46f207c8f7e7f
+Subproject commit 645d05396c13437dd57fa565238f6013eaf1541b