Minor fix to get the current desktop number detection working properly all the time.
A couple other minor fixes. Make sure to update the menu on the desktop switch when the desktop gets changes so that it properly shows which desktop is active, and also mke the main desktop menu display the current workspace number as the header for the menu.