diff --git a/README.md b/README.md
index 67368e1..2fdd2c0 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 Pytop is a Gtk + Python gui to have a custom desktop interface.
 
 # Updates
-convirted to using ffmpeg to generate thumbnail.
+Set taskbar menu option based on window options.
 
 # Notes
 ```sudo apt-get install python3 wget steamcmd```
@@ -10,5 +10,4 @@ convirted to using ffmpeg to generate thumbnail.
 # TODO
 <ul>
 <li>Detect window title changes</li>
-<li>Set taskbar menu option based on window options.</li>
 </ul>
diff --git a/bin/pytop-0-0-1-x64.deb b/bin/pytop-0-0-1-x64.deb
index 68dd6fb..dc92347 100644
Binary files a/bin/pytop-0-0-1-x64.deb and b/bin/pytop-0-0-1-x64.deb differ
diff --git a/src/Pytop/resources/PyTop.glade b/src/Pytop/resources/PyTop.glade
index 2423801..d564f8d 100644
--- a/src/Pytop/resources/PyTop.glade
+++ b/src/Pytop/resources/PyTop.glade
@@ -67,7 +67,6 @@
                     <property name="can_focus">True</property>
                     <property name="margin">6</property>
                     <property name="selection_mode">multiple</property>
-                    <property name="item_width">72</property>
                   </object>
                 </child>
               </object>
@@ -222,7 +221,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkCheckButton">
+          <object class="GtkCheckButton" id="alwaysOnTopToggle">
             <property name="label" translatable="yes">Always On Top</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
@@ -237,7 +236,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkCheckButton">
+          <object class="GtkCheckButton" id="alwaysBelowToggle">
             <property name="label" translatable="yes">Always Below</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
@@ -252,7 +251,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkCheckButton">
+          <object class="GtkCheckButton" id="alwaysOnVisableWorkspace">
             <property name="label" translatable="yes">Always On Visible Workspace</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
diff --git a/src/Pytop/signal_classes/TaskbarSignals.py b/src/Pytop/signal_classes/TaskbarSignals.py
index 5550d4d..1ec7d99 100644
--- a/src/Pytop/signal_classes/TaskbarSignals.py
+++ b/src/Pytop/signal_classes/TaskbarSignals.py
@@ -76,14 +76,42 @@ class TaskbarSignals:
 
     def clickEvent(self, widget, e, window):
         if e.type == gdk.EventType.BUTTON_PRESS and e.button == MouseButtons.LEFT_BUTTON:
-            if not window.is_minimized():
-                window.minimize()
-            else:
+            if window.is_minimized():
                 window.activate(1)
+            else:
+                window.minimize()
         if e.type == gdk.EventType.BUTTON_PRESS and e.button == MouseButtons.RIGHT_BUTTON:
             self.window = window
+            self.setTaskbarMenuStates()
             self.taskbarMenu.show()
 
+    def setTaskbarMenuStates(self):
+        if not self.window.is_above(): # If above all windows
+            self.builder.get_object("alwaysOnTopToggle").set_active(False)
+        else:
+            self.builder.get_object("alwaysOnTopToggle").set_active(True)
+
+        if not self.window.is_below(): # If below all windows
+            self.builder.get_object("alwaysBelowToggle").set_active(False)
+        else:
+            self.builder.get_object("alwaysBelowToggle").set_active(True)
+
+        if not self.window.is_pinned(): # If visable on all workspaces
+            self.builder.get_object("alwaysOnVisableWorkspace").set_active(False)
+        else:
+            self.builder.get_object("alwaysOnVisableWorkspace").set_active(True)
+
+        if not self.window.is_sticky(): # If visable on all workspaces??
+            pass
+        else:
+            pass
+
+        if not self.window.is_active(): # If window has focus
+            pass
+        else:
+            pass
+
+
     def hideTaskbarMenu(self, widget, eve):
         widget.hide()