diff --git a/coretk/coretk/coreclient.py b/coretk/coretk/coreclient.py
index 43aa88ed..7e86c87c 100644
--- a/coretk/coretk/coreclient.py
+++ b/coretk/coretk/coreclient.py
@@ -295,11 +295,13 @@ class CoreClient:
         response = self.client.get_session_metadata(self.session_id)
         self.parse_metadata(response.config)
 
+        # update ui to represent current state
         if self.is_runtime():
             self.app.toolbar.runtime_frame.tkraise()
         else:
             self.app.toolbar.design_frame.tkraise()
         self.app.statusbar.progress_bar.stop()
+        self.app.toolbar.click_selection()
 
     def is_runtime(self):
         return self.state == core_pb2.SessionState.RUNTIME
diff --git a/coretk/coretk/menuaction.py b/coretk/coretk/menuaction.py
index c4cc27bc..f7f9c579 100644
--- a/coretk/coretk/menuaction.py
+++ b/coretk/coretk/menuaction.py
@@ -109,7 +109,6 @@ class MenuAction:
             self.app.statusbar.progress_bar.start(5)
             thread = threading.Thread(target=self.app.core.open_xml, args=([file_path]))
             thread.start()
-            # self.app.core.open_xml(file_path)
 
     def gui_preferences(self):
         dialog = PreferencesDialog(self.app, self.app)
diff --git a/coretk/coretk/toolbar.py b/coretk/coretk/toolbar.py
index 1f1e734f..c9efa74c 100644
--- a/coretk/coretk/toolbar.py
+++ b/coretk/coretk/toolbar.py
@@ -40,8 +40,6 @@ class Toolbar(ttk.Frame):
         self.network_button = None
         self.annotation_button = None
 
-        # runtime buttons
-
         # frames
         self.design_frame = None
         self.runtime_frame = None