Rewrote HandleRightClick()