Fixes to menubar including adding other clusters to dropdown