CentralPoint: Do not add peer to list twice
Fix popup menus