Only add the upi if it's not already in the list.
Layout improvements and new icon.
Clean up.