Fixed up the piemenu, mostly there with the click version